diff --git a/.github/actions/check_workflow/action.yml b/.github/actions/check_workflow/action.yml
new file mode 100644
index 00000000000..19a3cec76f5
--- /dev/null
+++ b/.github/actions/check_workflow/action.yml
@@ -0,0 +1,21 @@
+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/release/action.yml b/.github/actions/release/action.yml
deleted file mode 100644
index c3897682a33..00000000000
--- a/.github/actions/release/action.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-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
deleted file mode 100644
index 457ffacc7a8..00000000000
--- a/.github/workflows/auto_release.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-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/create_release.yml b/.github/workflows/create_release.yml
index 55644bdd503..d4993b373df 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -16,10 +16,15 @@ 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: true
+        default: false
         type: boolean
 
 jobs:
@@ -35,10 +40,163 @@ jobs:
         with:
           token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
           fetch-depth: 0
-      - name: Call Release Action
-        uses: ./.github/actions/release
+      - 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 \
+            --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
         with:
-          ref: ${{ inputs.ref }}
-          type: ${{ inputs.type }}
-          dry-run: ${{ inputs.dry-run }}
-          token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
+          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: |
+          python3 ./tests/ci/create_release.py --set-progress-completed
+          git reset --hard HEAD
+          git checkout "$GITHUB_REF_NAME"
+      - 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' || '' }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 854dff530e7..071f0f1e20a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -142,8 +142,13 @@ jobs:
   # 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' && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Builds') }}
-    needs: [RunConfig, StyleCheck, Builds_1, Builds_2]
+    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]
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: Builds
@@ -167,12 +172,9 @@ jobs:
           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 ./tests/ci/ci_buddy.py --check-wf-status
+        uses: ./.github/actions/check_workflow
+        with:
+          needs: ${{ toJson(needs) }}
 
   ################################# Stage Final #################################
   #
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 3bd6dfae6ca..00000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-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/tags_stable.yml b/.github/workflows/tags_stable.yml
deleted file mode 100644
index 2aa7694bc41..00000000000
--- a/.github/workflows/tags_stable.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-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/base/poco/Foundation/include/Poco/UUID.h b/base/poco/Foundation/include/Poco/UUID.h
index df67ef73e4b..6466d226b2e 100644
--- a/base/poco/Foundation/include/Poco/UUID.h
+++ b/base/poco/Foundation/include/Poco/UUID.h
@@ -19,6 +19,7 @@
 
 
 #include "Poco/Foundation.h"
+#include <Poco/Types.h>
 
 
 namespace Poco
@@ -135,6 +136,12 @@ 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/MongoDB/src/Binary.cpp b/base/poco/MongoDB/src/Binary.cpp
index ea814d6969f..8b0e6baeccb 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 && _buffer.size() == 16)
+	if ((_subtype == 0x04 || _subtype == 0x03) && _buffer.size() == 16)
 	{
 		UUID uuid;
 		uuid.copyFrom((const char*) _buffer.begin());
 		return uuid;
 	}
-	throw BadCastException("Invalid subtype");
+	throw BadCastException("Invalid subtype: " + std::to_string(_subtype) + ", size: " + std::to_string(_buffer.size()));
 }
 
 
diff --git a/contrib/NuRaft b/contrib/NuRaft
index cb5dc3c906e..c2b0811f164 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit cb5dc3c906e80f253e9ce9535807caef827cc2e0
+Subproject commit c2b0811f164a7948208489562dab4f186eb305ce
diff --git a/contrib/icu-cmake/CMakeLists.txt b/contrib/icu-cmake/CMakeLists.txt
index f9d05f7fe97..adeaa7dcf33 100644
--- a/contrib/icu-cmake/CMakeLists.txt
+++ b/contrib/icu-cmake/CMakeLists.txt
@@ -4,9 +4,7 @@ else ()
     option(ENABLE_ICU "Enable ICU" 0)
 endif ()
 
-# Temporarily disabled s390x because the ICU build links a blob (icudt71b_dat.S) and our friends from IBM did not explain how they generated
-# the blob on s390x: https://github.com/ClickHouse/icudata/pull/2#issuecomment-2226957255
-if (NOT ENABLE_ICU OR ARCH_S390X)
+if (NOT ENABLE_ICU)
     message(STATUS "Not using ICU")
     return()
 endif()
diff --git a/contrib/icudata b/contrib/icudata
index d345d6ac22f..4904951339a 160000
--- a/contrib/icudata
+++ b/contrib/icudata
@@ -1 +1 @@
-Subproject commit d345d6ac22f381c882420de9053d30ae1ff38d75
+Subproject commit 4904951339a70b4814d2d3723436b20d079cb01b
diff --git a/docker/docs/builder/run.sh b/docker/docs/builder/run.sh
index 01c15cb4b0f..d73adb5d279 100755
--- a/docker/docs/builder/run.sh
+++ b/docker/docs/builder/run.sh
@@ -26,7 +26,6 @@ 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/test/base/Dockerfile b/docker/test/base/Dockerfile
index a81826ed6b5..e7ac62604dc 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -35,7 +35,9 @@ 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'
 
-# for external_symbolizer_path
+# 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}
 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/stateless/run.sh b/docker/test/stateless/run.sh
index f9f96c76d59..ea32df23af0 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -3,6 +3,12 @@
 # shellcheck disable=SC1091
 source /setup_export_logs.sh
 
+# shellcheck source=../stateless/stress_tests.lib
+source /stress_tests.lib
+
+# Avoid overlaps with previous runs
+dmesg --clear
+
 # fail on errors, verbose and export all env variables
 set -e -x -a
 
@@ -72,8 +78,12 @@ 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
+
 # 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
@@ -212,6 +222,10 @@ 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.
@@ -256,7 +270,7 @@ function run_tests()
     | ts '%Y-%m-%d %H:%M:%S' \
     | tee -a test_output/test_result.txt
     set -e
-    DURATION=$((START_TIME - SECONDS))
+    DURATION=$((SECONDS - START_TIME))
 
     echo "Elapsed ${DURATION} seconds."
     if [[ $DURATION -ge $TIMEOUT ]]
@@ -295,22 +309,22 @@ 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
-    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 ! clickhouse-client -q "select * from system.$table into outfile '/test_output/$table.tsv.zst' format TSVWithNamesAndTypes"; then
+        failed_to_save_logs=1
+    fi
     if [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
-        err=$( { clickhouse-client --port 19000 -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst; } 2>&1 )
-        echo "$err"
-        [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
-        err=$( { clickhouse-client --port 29000 -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.2.tsv.zst; } 2>&1 )
-        echo "$err"
-        [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
+        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
     fi
 
     if [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
-        err=$( { clickhouse-client --port 19000 -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst; } 2>&1 )
-        echo "$err"
-        [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
+        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
     fi
 done
 
@@ -383,6 +397,8 @@ 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/docker/test/stateless/stress_tests.lib b/docker/test/stateless/stress_tests.lib
index 682da1df837..36782101fa7 100644
--- a/docker/test/stateless/stress_tests.lib
+++ b/docker/test/stateless/stress_tests.lib
@@ -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
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
index babddbd228c..dc928ba7195 100644
--- a/docker/test/util/Dockerfile
+++ b/docker/test/util/Dockerfile
@@ -5,14 +5,6 @@ FROM ubuntu:22.04
 ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-# 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 \
diff --git a/docker/test/util/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
index 3da1a8f3674..aa2ea686c46 100755
--- a/docker/test/util/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -161,11 +161,11 @@ def process_result(result_path, broken_tests):
             retries,
             test_results,
         ) = process_test_log(result_path, broken_tests)
-        is_flacky_check = 1 < int(os.environ.get("NUM_TRIES", 1))
-        logging.info("Is flaky check: %s", is_flacky_check)
+        is_flaky_check = 1 < int(os.environ.get("NUM_TRIES", 1))
+        logging.info("Is flaky check: %s", is_flaky_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_flacky_check)):
+        if failed != 0 or unknown != 0 or (success == 0 and (not is_flaky_check)):
             state = "failure"
 
         if hung:
diff --git a/docs/changelogs/v20.5.1.3833-prestable.md b/docs/changelogs/v20.5.1.3833-prestable.md
index 79d61fb12f9..3de263f5e37 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 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)).
+* 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)).
 * 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 d6a435dd3ce..95c8580d591 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 flacky test [#29706](https://github.com/ClickHouse/ClickHouse/pull/29706) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 flacky tests [#29902](https://github.com/ClickHouse/ClickHouse/pull/29902) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix some flaky 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 flacky test [#30940](https://github.com/ClickHouse/ClickHouse/pull/30940) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 bd84873e67a..f5416664d35 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 flacky test [#30967](https://github.com/ClickHouse/ClickHouse/pull/30967) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 flacky test. [#31889](https://github.com/ClickHouse/ClickHouse/pull/31889) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Try to fix flaky 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 flacky test test_executable_storage_input [#32118](https://github.com/ClickHouse/ClickHouse/pull/32118) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix flaky 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 flacky fileLog test (probably) [#32209](https://github.com/ClickHouse/ClickHouse/pull/32209) ([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 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 flacky [#32257](https://github.com/ClickHouse/ClickHouse/pull/32257) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disable window view tests temporarily because still flaky [#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 b7dd8ae87c0..69ea9cb8d0e 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 flacky hedged tests [#22746](https://github.com/ClickHouse/ClickHouse/pull/22746) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix flaky 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 0a989e4d6b7..533c58badac 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 flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 7aaab54af6b..684d0e8995e 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 flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 cb6ab82b30f..6ef2f1b50d2 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 flacky rabbitmq test [#25756](https://github.com/ClickHouse/ClickHouse/pull/25756) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Try fix flaky 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 fa459e093f7..4d0727e362c 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 flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 bc921a68693..70ae3697e92 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 flacky test [#27383](https://github.com/ClickHouse/ClickHouse/pull/27383) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 cacd13c1e12..3b0422abb11 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 flackyness because of azure server closing connection [#33269](https://github.com/ClickHouse/ClickHouse/pull/33269) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix azure tests flakyness 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 flacky test_dictionaries_postgresql/ [#33601](https://github.com/ClickHouse/ClickHouse/pull/33601) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 b277137ca7e..e8304e6505f 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 flacky test 01161_all_system_tables under s3 storage [#36175](https://github.com/ClickHouse/ClickHouse/pull/36175) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky 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 ea16f5856be..34590ba9d37 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 flacky test_concurrent_alter_move_and_drop [#48843](https://github.com/ClickHouse/ClickHouse/pull/48843) ([Sergei Trifonov](https://github.com/serxa)).
+* Try fix flaky 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,4 +372,3 @@ 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 b91c5340789..0de9ab37653 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 flacky test test_profile_events_s3 [#51412](https://github.com/ClickHouse/ClickHouse/pull/51412) ([Sema Checherinda](https://github.com/CheSema)).
+* fix flaky 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
new file mode 100644
index 00000000000..75caf1ea277
--- /dev/null
+++ b/docs/changelogs/v23.8.16.40-lts.md
@@ -0,0 +1,35 @@
+---
+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.6.48-lts.md b/docs/changelogs/v24.3.6.48-lts.md
new file mode 100644
index 00000000000..f045afc619b
--- /dev/null
+++ b/docs/changelogs/v24.3.6.48-lts.md
@@ -0,0 +1,39 @@
+---
+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.4.4.113-stable.md b/docs/changelogs/v24.4.4.113-stable.md
new file mode 100644
index 00000000000..1f8a221a0a2
--- /dev/null
+++ b/docs/changelogs/v24.4.4.113-stable.md
@@ -0,0 +1,73 @@
+---
+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.78-stable.md b/docs/changelogs/v24.5.5.78-stable.md
new file mode 100644
index 00000000000..415ea165101
--- /dev/null
+++ b/docs/changelogs/v24.5.5.78-stable.md
@@ -0,0 +1,55 @@
+---
+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/en/operations/backup.md b/docs/en/operations/backup.md
index fc861e25e9f..248fdbc156f 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -85,6 +85,7 @@ 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/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 7278b91f90d..67fa45c20cd 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -119,11 +119,6 @@ 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.
@@ -691,6 +686,8 @@ 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`.
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 2a20e74e20f..14ccb1167f9 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,3 +426,17 @@ 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/sql-reference/aggregate-functions/reference/groupconcat.md b/docs/en/sql-reference/aggregate-functions/reference/groupconcat.md
new file mode 100644
index 00000000000..072252de8c9
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/groupconcat.md
@@ -0,0 +1,90 @@
+---
+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(expression [, delimiter] [, limit]);
+```
+
+**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 following the expression. 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, ', ', 2) 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(Name, ', ', 2) 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/functions/string-replace-functions.md b/docs/en/sql-reference/functions/string-replace-functions.md
index 8793ebdd1a3..177790c983e 100644
--- a/docs/en/sql-reference/functions/string-replace-functions.md
+++ b/docs/en/sql-reference/functions/string-replace-functions.md
@@ -223,3 +223,28 @@ 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 b7ba1d4feb7..e9ff7ebf33b 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 position('Hello, world!', 'hello');
+SELECT positionCaseInsensitive('Hello, world!', 'hello');
 ```
 
 Result:
 
 ``` text
-┌─position('Hello, world!', 'hello')─┐
-│                                  0 │
-└────────────────────────────────────┘
+┌─positionCaseInsensitive('Hello, world!', 'hello')─┐
+│                                                 1 │
+└───────────────────────────────────────────────────┘
 ```
 
 ## positionUTF8
diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index 24b356eca87..d670ed42a2a 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 of keys and an array of values.
+Creates a map from an array or map of keys and an array or map 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 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).
+- `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).
 
 **Returned value**
 
@@ -99,6 +99,18 @@ 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/window-functions/dense_rank.md b/docs/en/sql-reference/window-functions/dense_rank.md
index d6445b68c55..2c8617fb668 100644
--- a/docs/en/sql-reference/window-functions/dense_rank.md
+++ b/docs/en/sql-reference/window-functions/dense_rank.md
@@ -12,6 +12,8 @@ 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 0c3e2ea1cb6..27d4bd763c7 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()`                                           | ✅                                                                                                                                                                                   |
-| `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)`| 
+| `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()`| 
 | `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/zh/changelog/index.md b/docs/zh/changelog/index.md
index cd77a8c03cf..fb50dfcee85 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))
--   修复flacky测试 `00910_zookeeper_test_alter_compression_codecs`. [#9525](https://github.com/ClickHouse/ClickHouse/pull/9525) ([阿列克谢-米洛维多夫](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))
 -   清理重复的链接器标志。 确保链接器不会查找意想不到的符号。 [#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/programs/keeper/keeper_config.xml b/programs/keeper/keeper_config.xml
index 4cf84cffc86..efd0010d184 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/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 01c7b9c3a54..6b0b8fc5b50 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -1,6 +1,7 @@
 #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>
@@ -127,10 +128,21 @@ 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
-    if (getClientConfiguration().has("config-file") || fs::exists("config.xml"))
+    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))
     {
-        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();
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 20db4c2773c..7800ee9ff00 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -849,7 +849,7 @@ try
 #endif
 
 #if defined(SANITIZER)
-    LOG_INFO(log, "Query Profiler disabled because they cannot work under sanitizers"
+    LOG_INFO(log, "Query Profiler is disabled because it cannot work under sanitizers"
         " when two different stack unwinding methods will interfere with each other.");
 #endif
 
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 5dedd78ff2a..e0ccd22dc4e 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -1130,8 +1130,7 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_views_log>
 
-    <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
+    <!-- Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads). -->
     <part_log>
         <database>system</database>
         <table>part_log</table>
@@ -1143,9 +1142,9 @@
         <flush_on_crash>false</flush_on_crash>
     </part_log>
 
-    <!-- Uncomment to write text log into table.
-         Text log contains all information from usual server log but stores it in structured and efficient way.
+    <!-- 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>
@@ -1154,9 +1153,8 @@
         <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></level>
+        <level>trace</level>
     </text_log>
-    -->
 
     <!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval. -->
     <metric_log>
diff --git a/programs/server/dashboard.html b/programs/server/dashboard.html
index 45f988f7b1e..0b099b15536 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, 255, 0.75);
+            --legend-background: rgba(255, 255, 0, 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(255, 255, 255, 0.25);
+            --legend-background: rgba(0, 96, 128, 0.75);
             --title-color: white;
             --text-color: white;
             --edit-title-background: #364f69;
@@ -218,6 +218,7 @@
 
         #chart-params .param {
             width: 6%;
+            font-family: monospace;
         }
 
         input {
@@ -256,6 +257,7 @@
             font-weight: bold;
             user-select: none;
             cursor: pointer;
+            margin-bottom: 1rem;
         }
 
         #run:hover {
@@ -309,7 +311,7 @@
             color: var(--param-text-color);
             display: inline-block;
             box-shadow: 1px 1px 0 var(--shadow-color);
-            margin-bottom: 1rem;
+            margin-bottom: 0.5rem;
         }
 
         input:focus {
@@ -657,6 +659,10 @@ 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);
@@ -945,6 +951,7 @@ 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;
 }
 
@@ -1004,14 +1011,14 @@ function legendAsTooltipPlugin({ className, style = { background: "var(--legend-
         className && legendEl.classList.add(className);
 
         uPlot.assign(legendEl.style, {
-            textAlign: "left",
+            textAlign: "right",
             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
         });
 
@@ -1051,8 +1058,10 @@ function legendAsTooltipPlugin({ className, style = { background: "var(--legend-
 
     function update(u) {
         let { left, top } = u.cursor;
-        left -= legendEl.clientWidth / 2;
-        top -= legendEl.clientHeight / 2;
+        /// 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;
         legendEl.style.transform = "translate(" + left + "px, " + top + "px)";
 
         if (multiline) {
@@ -1139,7 +1148,7 @@ async function draw(idx, chart, url_params, query) {
 
     let {reply, error} = await doFetch(query, url_params);
     if (!error) {
-        if (reply.rows.length == 0) {
+        if (reply.rows == 0) {
             error = "Query returned empty result.";
         } else if (reply.meta.length < 2) {
             error = "Query should return at least two columns: unix timestamp and value.";
@@ -1229,14 +1238,53 @@ async function draw(idx, chart, url_params, query) {
 
     let sync = uPlot.sync("sync");
 
-    let axis = {
+    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 = {
         stroke: axes_color,
         grid: { width: 1 / devicePixelRatio, stroke: grid_color },
-        ticks: { 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],
     };
 
-    let axes = [axis, axis];
-    let series = [{ label: "x" }];
+    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 data = [reply.data[reply.meta[0].name]];
 
     // Treat every column as series
@@ -1254,9 +1302,10 @@ 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, (Math.round(max_value * 100) / 100).toString().length * 6 - 10 ],
+        padding: [ null, null, null, 3 ],
         plugins: [ legendAsTooltipPlugin() ],
         cursor: {
             sync: {
diff --git a/pyproject.toml b/pyproject.toml
index c89d46c0929..4268901e7f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,8 @@ disable = '''
           no-else-return,
           global-statement,
           f-string-without-interpolation,
+          consider-using-with,
+          use-maxsplit-arg,
           '''
 
 [tool.pylint.SIMILARITIES]
diff --git a/src/AggregateFunctions/UniqVariadicHash.h b/src/AggregateFunctions/UniqVariadicHash.h
index 5bb245397d4..279feed8bc6 100644
--- a/src/AggregateFunctions/UniqVariadicHash.h
+++ b/src/AggregateFunctions/UniqVariadicHash.h
@@ -67,6 +67,9 @@ struct UniqVariadicHash<false, true>
 {
     static UInt64 apply(size_t num_args, const IColumn ** columns, size_t row_num)
     {
+        if (!num_args)
+            return 0;
+
         UInt64 hash;
 
         const auto & tuple_columns = assert_cast<const ColumnTuple *>(columns[0])->getColumns();
diff --git a/src/Analyzer/InterpolateNode.cpp b/src/Analyzer/InterpolateNode.cpp
index 97dc79f565b..17c734cf386 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\n";
+    buffer << '\n' << std::string(indent + 2, ' ') << "EXPRESSION " << expression_name << " \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 ec493ed8bdd..eb3d64d7170 100644
--- a/src/Analyzer/InterpolateNode.h
+++ b/src/Analyzer/InterpolateNode.h
@@ -50,6 +50,8 @@ 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 180470952cd..76dc8ab94b4 100644
--- a/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
+++ b/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
@@ -11,6 +11,7 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
+#include <Analyzer/JoinNode.h>
 #include <Analyzer/Utils.h>
 
 namespace DB
@@ -25,8 +26,15 @@ public:
     using Base = InDepthQueryTreeVisitorWithContext<ComparisonTupleEliminationPassVisitor>;
     using Base::Base;
 
-    static bool needChildVisit(QueryTreeNodePtr &, QueryTreeNodePtr & child)
+    static bool needChildVisit(QueryTreeNodePtr & parent, 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;
     }
 
diff --git a/src/Analyzer/Resolve/QueryAnalyzer.cpp b/src/Analyzer/Resolve/QueryAnalyzer.cpp
index 767d5c11075..e04b93314c5 100644
--- a/src/Analyzer/Resolve/QueryAnalyzer.cpp
+++ b/src/Analyzer/Resolve/QueryAnalyzer.cpp
@@ -64,6 +64,8 @@
 #include <Analyzer/Resolve/TableExpressionsAliasVisitor.h>
 #include <Analyzer/Resolve/ReplaceColumnsVisitor.h>
 
+#include <Planner/PlannerActionsVisitor.h>
+
 #include <Core/Settings.h>
 
 namespace ProfileEvents
@@ -4122,11 +4124,7 @@ void QueryAnalyzer::resolveInterpolateColumnsNodeList(QueryTreeNodePtr & interpo
     {
         auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
 
-        auto * column_to_interpolate = interpolate_node_typed.getExpression()->as<IdentifierNode>();
-        if (!column_to_interpolate)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "INTERPOLATE can work only for indentifiers, but {} is found",
-                interpolate_node_typed.getExpression()->formatASTForErrorMessage());
-        auto column_to_interpolate_name = column_to_interpolate->getIdentifier().getFullName();
+        auto column_to_interpolate_name = interpolate_node_typed.getExpressionName();
 
         resolveExpressionNode(interpolate_node_typed.getExpression(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
 
@@ -4135,14 +4133,11 @@ 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_typed.getExpression());
+        auto fake_column_node = std::make_shared<ColumnNode>(NameAndTypePair(column_to_interpolate_name, interpolate_node_typed.getExpression()->getResultType()), interpolate_node);
         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());
     }
 }
 
@@ -4546,7 +4541,15 @@ 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>())
                     {
-                        view_params[identifier_node->getIdentifier().getFullName()] = convertFieldToString(constant->getValue());
+                        /// 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();
                     }
                 }
             }
diff --git a/src/Analyzer/SetUtils.cpp b/src/Analyzer/SetUtils.cpp
index 0ecb3545225..e7d1a22f45a 100644
--- a/src/Analyzer/SetUtils.cpp
+++ b/src/Analyzer/SetUtils.cpp
@@ -43,6 +43,12 @@ 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;
         }
diff --git a/src/Backups/BackupFactory.h b/src/Backups/BackupFactory.h
index e13a9a12ca2..807b8516d49 100644
--- a/src/Backups/BackupFactory.h
+++ b/src/Backups/BackupFactory.h
@@ -41,6 +41,7 @@ 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 3f972c36e47..23f067a62f5 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -92,7 +92,8 @@ 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_s3_credentials_for_base_backup_,
+    bool use_same_password_for_base_backup_)
     : backup_info(backup_info_)
     , backup_name_for_logging(backup_info.toStringForLogging())
     , use_archive(!archive_params_.archive_name.empty())
@@ -104,6 +105,7 @@ BackupImpl::BackupImpl(
     , version(INITIAL_BACKUP_VERSION)
     , base_backup_info(base_backup_info_)
     , use_same_s3_credentials_for_base_backup(use_same_s3_credentials_for_base_backup_)
+    , use_same_password_for_base_backup(use_same_password_for_base_backup_)
     , log(getLogger("BackupImpl"))
 {
     open();
@@ -120,7 +122,8 @@ 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_s3_credentials_for_base_backup_,
+    bool use_same_password_for_base_backup_)
     : backup_info(backup_info_)
     , backup_name_for_logging(backup_info.toStringForLogging())
     , use_archive(!archive_params_.archive_name.empty())
@@ -135,6 +138,7 @@ BackupImpl::BackupImpl(
     , base_backup_info(base_backup_info_)
     , deduplicate_files(deduplicate_files_)
     , use_same_s3_credentials_for_base_backup(use_same_s3_credentials_for_base_backup_)
+    , use_same_password_for_base_backup(use_same_password_for_base_backup_)
     , log(getLogger("BackupImpl"))
 {
     open();
@@ -258,6 +262,11 @@ 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 2b27e2ab090..d7846104c4c 100644
--- a/src/Backups/BackupImpl.h
+++ b/src/Backups/BackupImpl.h
@@ -41,7 +41,8 @@ public:
         std::shared_ptr<IBackupReader> reader_,
         const ContextPtr & context_,
         bool is_internal_backup_,
-        bool use_same_s3_credentials_for_base_backup_);
+        bool use_same_s3_credentials_for_base_backup_,
+        bool use_same_password_for_base_backup_);
 
     BackupImpl(
         const BackupInfo & backup_info_,
@@ -53,7 +54,8 @@ 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_s3_credentials_for_base_backup_,
+        bool use_same_password_for_base_backup_);
 
     ~BackupImpl() override;
 
@@ -153,6 +155,7 @@ 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 e33880f88e3..37ddd344001 100644
--- a/src/Backups/BackupSettings.cpp
+++ b/src/Backups/BackupSettings.cpp
@@ -29,6 +29,7 @@ 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) \
diff --git a/src/Backups/BackupSettings.h b/src/Backups/BackupSettings.h
index a6c4d5d7181..0abeb897db4 100644
--- a/src/Backups/BackupSettings.h
+++ b/src/Backups/BackupSettings.h
@@ -50,6 +50,9 @@ struct BackupSettings
     /// Whether base backup to S3 should inherit credentials from the BACKUP query.
     bool use_same_s3_credentials_for_base_backup = false;
 
+    /// Whether 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 ab278429f5f..0b93ae6d547 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -602,6 +602,7 @@ 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);
@@ -924,6 +925,7 @@ 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/RestoreCoordinationRemote.cpp b/src/Backups/RestoreCoordinationRemote.cpp
index 44214d00be5..0a69bc0eafb 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 9c299865cfa..a3d57e9a4d0 100644
--- a/src/Backups/RestoreCoordinationRemote.h
+++ b/src/Backups/RestoreCoordinationRemote.h
@@ -61,8 +61,6 @@ 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 7bbfd9ed751..a974fc11d00 100644
--- a/src/Backups/RestoreSettings.cpp
+++ b/src/Backups/RestoreSettings.cpp
@@ -164,6 +164,7 @@ 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 06ecbc80aef..fe07a0a7208 100644
--- a/src/Backups/RestoreSettings.h
+++ b/src/Backups/RestoreSettings.h
@@ -113,6 +113,9 @@ 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 3056f9fe421..278af9d4eb3 100644
--- a/src/Backups/RestorerFromBackup.cpp
+++ b/src/Backups/RestorerFromBackup.cpp
@@ -222,10 +222,19 @@ void RestorerFromBackup::setStage(const String & new_stage, const String & messa
     if (restore_coordination)
     {
         restore_coordination->setStage(new_stage, message);
-        if (new_stage == Stage::FINDING_TABLES_IN_BACKUP)
-            restore_coordination->waitForStage(new_stage, on_cluster_first_sync_timeout);
-        else
-            restore_coordination->waitForStage(new_stage);
+
+        /// 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);
+        }
     }
 }
 
diff --git a/src/Backups/registerBackupEngineAzureBlobStorage.cpp b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
index 626df99b00c..45f0386375a 100644
--- a/src/Backups/registerBackupEngineAzureBlobStorage.cpp
+++ b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
@@ -141,7 +141,8 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
                 reader,
                 params.context,
                 params.is_internal_backup,
-                /* use_same_s3_credentials_for_base_backup*/ false);
+                /* use_same_s3_credentials_for_base_backup*/ false,
+                params.use_same_password_for_base_backup);
         }
         else
         {
@@ -164,7 +165,8 @@ void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
                 params.backup_coordination,
                 params.backup_uuid,
                 params.deduplicate_files,
-                /* use_same_s3_credentials_for_base_backup */ false);
+                /* use_same_s3_credentials_for_base_backup */ false,
+                params.use_same_password_for_base_backup);
         }
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "AzureBlobStorage support is disabled");
diff --git a/src/Backups/registerBackupEngineS3.cpp b/src/Backups/registerBackupEngineS3.cpp
index 59ed9506af0..79e3e945557 100644
--- a/src/Backups/registerBackupEngineS3.cpp
+++ b/src/Backups/registerBackupEngineS3.cpp
@@ -120,7 +120,8 @@ void registerBackupEngineS3(BackupFactory & factory)
                 reader,
                 params.context,
                 params.is_internal_backup,
-                params.use_same_s3_credentials_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup,
+                params.use_same_password_for_base_backup);
         }
         else
         {
@@ -144,7 +145,8 @@ void registerBackupEngineS3(BackupFactory & factory)
                 params.backup_coordination,
                 params.backup_uuid,
                 params.deduplicate_files,
-                params.use_same_s3_credentials_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup,
+                params.use_same_password_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 35263d39cba..c486f79a77a 100644
--- a/src/Backups/registerBackupEnginesFileAndDisk.cpp
+++ b/src/Backups/registerBackupEnginesFileAndDisk.cpp
@@ -178,7 +178,8 @@ void registerBackupEnginesFileAndDisk(BackupFactory & factory)
                 reader,
                 params.context,
                 params.is_internal_backup,
-                params.use_same_s3_credentials_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup,
+                params.use_same_password_for_base_backup);
         }
         else
         {
@@ -197,7 +198,8 @@ void registerBackupEnginesFileAndDisk(BackupFactory & factory)
                 params.backup_coordination,
                 params.backup_uuid,
                 params.deduplicate_files,
-                params.use_same_s3_credentials_for_base_backup);
+                params.use_same_s3_credentials_for_base_backup,
+                params.use_same_password_for_base_backup);
         }
     };
 
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index e26fe790a8e..4bc48c62eb4 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -330,7 +330,38 @@ ColumnPtr ColumnAggregateFunction::filter(const Filter & filter, ssize_t result_
 
 void ColumnAggregateFunction::expand(const Filter & mask, bool inverted)
 {
-    expandDataByMask<char *>(data, mask, inverted);
+    ensureOwnership();
+    Arena & arena = createOrGetArena();
+
+    if (mask.size() < data.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Mask size should be no less than data size.");
+
+    ssize_t from = data.size() - 1;
+    ssize_t index = mask.size() - 1;
+    data.resize(mask.size());
+    while (index >= 0)
+    {
+        if (!!mask[index] ^ inverted)
+        {
+            if (from < 0)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Too many bytes in mask");
+
+            /// Copy only if it makes sense.
+            if (index != from)
+                data[index] = data[from];
+            --from;
+        }
+        else
+        {
+            data[index] = arena.alignedAlloc(func->sizeOfData(), func->alignOfData());
+            func->create(data[index]);
+        }
+
+        --index;
+    }
+
+    if (from != -1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not enough bytes in mask");
 }
 
 ColumnPtr ColumnAggregateFunction::permute(const Permutation & perm, size_t limit) const
diff --git a/src/Common/AsyncLoader.cpp b/src/Common/AsyncLoader.cpp
index 6264eb03106..d40e320e741 100644
--- a/src/Common/AsyncLoader.cpp
+++ b/src/Common/AsyncLoader.cpp
@@ -218,20 +218,27 @@ 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())
-        return;
+    {
+        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::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();
+    // 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();
 }
 
 void AsyncLoader::start()
diff --git a/src/Common/Config/CMakeLists.txt b/src/Common/Config/CMakeLists.txt
index 09095ef5acc..2bd32b98bda 100644
--- a/src/Common/Config/CMakeLists.txt
+++ b/src/Common/Config/CMakeLists.txt
@@ -2,6 +2,7 @@ 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 67d6036aa51..c4b4a1d5e7e 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -138,9 +138,14 @@ 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 s.find_first_not_of(" \t\n\r") == std::string::npos;
+    return firstNonWhitespacePos(s) == std::string::npos;
 }
 
 static void deleteAttributesRecursive(Node * root)
@@ -622,6 +627,49 @@ 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,
@@ -633,23 +681,7 @@ XMLDocumentPtr ConfigProcessor::processConfig(
 
     if (fs::exists(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);
-        }
+        config = parseConfig(path);
     }
     else
     {
@@ -673,20 +705,7 @@ XMLDocumentPtr ConfigProcessor::processConfig(
             LOG_DEBUG(log, "Merging configuration file '{}'.", merge_file);
 
             XMLDocumentPtr with;
-
-            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);
-            }
-
+            with = parseConfig(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 '{}'",
@@ -730,19 +749,7 @@ XMLDocumentPtr ConfigProcessor::processConfig(
         {
             LOG_DEBUG(log, "Including configuration file '{}'.", 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);
-            }
-
+            include_from = parseConfig(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 5712c36d737..a9d1325b722 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -65,6 +65,8 @@ 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 a32ad1068bf..5e9bb16bc85 100644
--- a/src/Common/Config/getClientConfigPath.cpp
+++ b/src/Common/Config/getClientConfigPath.cpp
@@ -12,7 +12,6 @@ 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");
@@ -28,18 +27,10 @@ std::optional<std::string> getClientConfigPath(const std::string & home_path)
 
             std::error_code ec;
             if (fs::exists(config_path, ec))
-            {
-                found = true;
-                break;
-            }
+                return config_path;
         }
-        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
new file mode 100644
index 00000000000..195de8aed03
--- /dev/null
+++ b/src/Common/Config/getLocalConfigPath.cpp
@@ -0,0 +1,37 @@
+#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
new file mode 100644
index 00000000000..14625571d6c
--- /dev/null
+++ b/src/Common/Config/getLocalConfigPath.h
@@ -0,0 +1,12 @@
+#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 1011ab12d15..b6dd14d292c 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -306,6 +306,8 @@
     \
     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(S3DiskNoKeyErrors, "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/Epoll.cpp b/src/Common/Epoll.cpp
index 49c86222cf0..ef7c6e143a0 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 DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Cannot open epoll descriptor");
+        throw ErrnoException(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 DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Cannot add new descriptor to epoll");
+        throw ErrnoException(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 DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Cannot remove descriptor from epoll");
+        throw ErrnoException(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 DB::ErrnoException(DB::ErrorCodes::EPOLL_ERROR, "Error in epoll_wait");
+                throw ErrnoException(ErrorCodes::EPOLL_ERROR, "Error in epoll_wait");
         }
         else
             break;
diff --git a/src/Common/EventRateMeter.h b/src/Common/EventRateMeter.h
index 3a21a80ce8b..b8a9112428f 100644
--- a/src/Common/EventRateMeter.h
+++ b/src/Common/EventRateMeter.h
@@ -4,8 +4,6 @@
 
 #include <Common/ExponentiallySmoothedCounter.h>
 
-#include <numbers>
-
 
 namespace DB
 {
@@ -14,9 +12,10 @@ namespace DB
 class EventRateMeter
 {
 public:
-    explicit EventRateMeter(double now, double period_)
+    explicit EventRateMeter(double now, double period_, size_t heating_ = 0)
         : period(period_)
-        , half_decay_time(period * std::numbers::ln2) // for `ExponentiallySmoothedAverage::sumWeights()` to be equal to `1/period`
+        , max_interval(period * 10)
+        , heating(heating_)
     {
         reset(now);
     }
@@ -29,16 +28,11 @@ 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 < 5)
-        {
-            start = events.time;
-            events = ExponentiallySmoothedAverage();
-        }
+        if (count != 0.0 && data_points++ <= heating)
+            reset(events.time, data_points);
 
-        if (now - period <= start) // precise counting mode
-            events = ExponentiallySmoothedAverage(events.value + count, now);
-        else // exponential smoothing mode
-            events.add(count, now, half_decay_time);
+        duration.add(std::min(max_interval, now - duration.time), now, period);
+        events.add(count, now, period);
     }
 
     /// Compute average event rate throughout `[now - period, now]` period.
@@ -49,24 +43,26 @@ public:
         add(now, 0);
         if (unlikely(now <= start))
             return 0;
-        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`
+
+        // We do not use .get() because sum of weights will anyway be canceled out (optimization)
+        return events.value / duration.value;
     }
 
-    void reset(double now)
+    void reset(double now, size_t data_points_ = 0)
     {
         start = now;
         events = ExponentiallySmoothedAverage();
-        data_points = 0;
+        duration = ExponentiallySmoothedAverage();
+        data_points = data_points_;
     }
 
 private:
     const double period;
-    const double half_decay_time;
+    const double max_interval;
+    const size_t heating;
     double start; // Instant in past without events before it; when measurement started or reset
-    ExponentiallySmoothedAverage events; // Estimated number of events in the last `period`
+    ExponentiallySmoothedAverage duration; // Current duration of a period
+    ExponentiallySmoothedAverage events; // Estimated number of events in last `duration` seconds
     size_t data_points = 0;
 };
 
diff --git a/src/Common/HostResolvePool.cpp b/src/Common/HostResolvePool.cpp
index cad64ee7204..e8a05a269bc 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 & rec : merged)
+    for (auto & record : merged)
     {
-            if (!rec.failed)
-                continue;
+        if (!record.failed || !record.consecutive_fail_count)
+            continue;
 
-            /// 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);
-            }
+        /// 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);
+        }
     }
 
     chassert(std::is_sorted(merged.begin(), merged.end()));
diff --git a/src/Common/JSONParsers/RapidJSONParser.h b/src/Common/JSONParsers/RapidJSONParser.h
index 6c5ea938bfe..ad7a4cbf53a 100644
--- a/src/Common/JSONParsers/RapidJSONParser.h
+++ b/src/Common/JSONParsers/RapidJSONParser.h
@@ -3,10 +3,14 @@
 #include "config.h"
 
 #if USE_RAPIDJSON
-#    include <base/types.h>
-#    include <base/defines.h>
-#    include <rapidjson/document.h>
-#    include "ElementTypes.h"
+
+/// Prevent stack overflow:
+#define RAPIDJSON_PARSE_DEFAULT_FLAGS (kParseIterativeFlag)
+
+#include <base/types.h>
+#include <base/defines.h>
+#include <rapidjson/document.h>
+#include "ElementTypes.h"
 
 namespace DB
 {
diff --git a/src/Common/ObjectStorageKeyGenerator.cpp b/src/Common/ObjectStorageKeyGenerator.cpp
index e9212c3f04d..3bdc0004198 100644
--- a/src/Common/ObjectStorageKeyGenerator.cpp
+++ b/src/Common/ObjectStorageKeyGenerator.cpp
@@ -14,7 +14,10 @@ public:
     , re_gen(key_template)
     {
     }
-    DB::ObjectStorageKey generate(const String &, bool) const override { return DB::ObjectStorageKey::createAsAbsolute(re_gen.generate()); }
+    DB::ObjectStorageKey generate(const String &, bool /* is_directory */, const std::optional<String> & /* key_prefix */) const override
+    {
+        return DB::ObjectStorageKey::createAsAbsolute(re_gen.generate());
+    }
 
 private:
     String key_template;
@@ -29,7 +32,7 @@ public:
         : key_prefix(std::move(key_prefix_))
     {}
 
-    DB::ObjectStorageKey generate(const String &, bool) const override
+    DB::ObjectStorageKey generate(const String &, bool /* is_directory */, const std::optional<String> & /* key_prefix */) const override
     {
         /// Path to store the new S3 object.
 
@@ -60,7 +63,8 @@ public:
         : key_prefix(std::move(key_prefix_))
     {}
 
-    DB::ObjectStorageKey generate(const String & path, bool) const override
+    DB::ObjectStorageKey
+    generate(const String & path, bool /* is_directory */, const std::optional<String> & /* key_prefix */) const override
     {
         return DB::ObjectStorageKey::createAsRelative(key_prefix, path);
     }
diff --git a/src/Common/ObjectStorageKeyGenerator.h b/src/Common/ObjectStorageKeyGenerator.h
index 11da039b33b..008e3c88fac 100644
--- a/src/Common/ObjectStorageKeyGenerator.h
+++ b/src/Common/ObjectStorageKeyGenerator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <optional>
 #include "ObjectStorageKey.h"
 
 namespace DB
@@ -11,7 +12,11 @@ class IObjectStorageKeysGenerator
 public:
     virtual ~IObjectStorageKeysGenerator() = default;
 
-    virtual ObjectStorageKey generate(const String & path, bool is_directory) const = 0;
+    /// 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;
 };
 
 using ObjectStorageKeysGeneratorPtr = std::shared_ptr<IObjectStorageKeysGenerator>;
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 2b090136e2e..f8bd84df131 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -193,8 +193,10 @@
     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).") \
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index 9baa1c7ffc4..474dd8db715 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*/}; // average cpu utilization last 2 second
+    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
     HostToTimesMap hosts_data;
     /// In case of all of the above:
     /// - clickhouse-local
diff --git a/src/Common/Scheduler/ISchedulerNode.h b/src/Common/Scheduler/ISchedulerNode.h
index 81b491b0eda..c051829e336 100644
--- a/src/Common/Scheduler/ISchedulerNode.h
+++ b/src/Common/Scheduler/ISchedulerNode.h
@@ -3,6 +3,8 @@
 #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>
 
@@ -176,6 +178,14 @@ 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;
@@ -189,6 +199,10 @@ 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/Nodes/FairPolicy.h b/src/Common/Scheduler/Nodes/FairPolicy.h
index 0a4e55c253b..fba637e979e 100644
--- a/src/Common/Scheduler/Nodes/FairPolicy.h
+++ b/src/Common/Scheduler/Nodes/FairPolicy.h
@@ -188,8 +188,7 @@ public:
 
             if (request)
             {
-                dequeued_requests++;
-                dequeued_cost += request->cost;
+                incrementDequeued(request->cost);
                 return {request, heap_size > 0};
             }
         }
diff --git a/src/Common/Scheduler/Nodes/FifoQueue.h b/src/Common/Scheduler/Nodes/FifoQueue.h
index 9ec997c06d2..9fbc6d1ae65 100644
--- a/src/Common/Scheduler/Nodes/FifoQueue.h
+++ b/src/Common/Scheduler/Nodes/FifoQueue.h
@@ -59,8 +59,7 @@ public:
         if (requests.empty())
             busy_periods++;
         queue_cost -= result->cost;
-        dequeued_requests++;
-        dequeued_cost += result->cost;
+        incrementDequeued(result->cost);
         return {result, !requests.empty()};
     }
 
diff --git a/src/Common/Scheduler/Nodes/PriorityPolicy.h b/src/Common/Scheduler/Nodes/PriorityPolicy.h
index 22a5155cfeb..91dc95600d5 100644
--- a/src/Common/Scheduler/Nodes/PriorityPolicy.h
+++ b/src/Common/Scheduler/Nodes/PriorityPolicy.h
@@ -122,8 +122,7 @@ public:
 
             if (request)
             {
-                dequeued_requests++;
-                dequeued_cost += request->cost;
+                incrementDequeued(request->cost);
                 return {request, !items.empty()};
             }
         }
diff --git a/src/Common/Scheduler/Nodes/SemaphoreConstraint.h b/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
index 10fce536f5d..92c6af9db18 100644
--- a/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
+++ b/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
@@ -81,8 +81,7 @@ public:
         child_active = child_now_active;
         if (!active())
             busy_periods++;
-        dequeued_requests++;
-        dequeued_cost += request->cost;
+        incrementDequeued(request->cost);
         return {request, active()};
     }
 
diff --git a/src/Common/Scheduler/Nodes/ThrottlerConstraint.h b/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
index f4a5795bb2b..56866336f50 100644
--- a/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
+++ b/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
@@ -89,8 +89,7 @@ public:
         child_active = child_now_active;
         if (!active())
             busy_periods++;
-        dequeued_requests++;
-        dequeued_cost += request->cost;
+        incrementDequeued(request->cost);
         return {request, active()};
     }
 
diff --git a/src/Common/Scheduler/SchedulerRoot.h b/src/Common/Scheduler/SchedulerRoot.h
index 7af42fdbbea..5307aadc3cc 100644
--- a/src/Common/Scheduler/SchedulerRoot.h
+++ b/src/Common/Scheduler/SchedulerRoot.h
@@ -162,8 +162,7 @@ public:
             if (request == nullptr) // Possible in case of request cancel, just retry
                 continue;
 
-            dequeued_requests++;
-            dequeued_cost += request->cost;
+            incrementDequeued(request->cost);
             return {request, current != nullptr};
         }
     }
diff --git a/src/Common/SystemLogBase.cpp b/src/Common/SystemLogBase.cpp
index a9307c3be99..7d2c15714e2 100644
--- a/src/Common/SystemLogBase.cpp
+++ b/src/Common/SystemLogBase.cpp
@@ -65,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 flacky.
+    /// Otherwise the tests like 01017_uniqCombined_memory_usage.sql will be flaky.
     MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
 
     /// Should not log messages under mutex.
diff --git a/src/Common/ThreadPoolTaskTracker.cpp b/src/Common/ThreadPoolTaskTracker.cpp
index 61d34801f7a..1697a13f780 100644
--- a/src/Common/ThreadPoolTaskTracker.cpp
+++ b/src/Common/ThreadPoolTaskTracker.cpp
@@ -19,6 +19,10 @@ 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();
 }
 
@@ -170,4 +174,3 @@ bool TaskTracker::isAsync() const
 }
 
 }
-
diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index 9a171ae9487..1622642c507 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -2,6 +2,7 @@
 
 #include <Common/TimerDescriptor.h>
 #include <Common/Exception.h>
+#include <Common/Epoll.h>
 #include <Common/logger_useful.h>
 
 #include <sys/timerfd.h>
@@ -75,10 +76,22 @@ void TimerDescriptor::drain() const
     /// 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:
@@ -110,6 +123,9 @@ void TimerDescriptor::drain() const
                     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;
             }
 
diff --git a/src/Common/tests/gtest_event_rate_meter.cpp b/src/Common/tests/gtest_event_rate_meter.cpp
new file mode 100644
index 00000000000..91ceec5eef7
--- /dev/null
+++ b/src/Common/tests/gtest_event_rate_meter.cpp
@@ -0,0 +1,68 @@
+#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/Core/Settings.h b/src/Core/Settings.h
index 6b4da255444..0d498ce7699 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -936,6 +936,7 @@ class IColumn;
     M(UInt64, parallel_replicas_min_number_of_rows_per_replica, 0, "Limit the number of replicas used in a query to (estimated rows to read / min_number_of_rows_per_replica). The max is still limited by 'max_parallel_replicas'", 0) \
     M(Bool, parallel_replicas_prefer_local_join, true, "If true, and JOIN can be executed with parallel replicas algorithm, and all storages of right JOIN part are *MergeTree, local JOIN will be used instead of GLOBAL JOIN.", 0) \
     M(UInt64, parallel_replicas_mark_segment_size, 128, "Parts virtually divided into segments to be distributed between replicas for parallel reading. This setting controls the size of these segments. Not recommended to change until you're absolutely sure in what you're doing", 0) \
+    M(Bool, 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, 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) \
@@ -1126,6 +1127,7 @@ class IColumn;
     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_json_case_insensitive_column_matching, false, "Ignore case when matching JSON keys with CH columns", 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_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) \
diff --git a/src/Core/SettingsChangesHistory.cpp b/src/Core/SettingsChangesHistory.cpp
index 28c8ce96823..5b94391bade 100644
--- a/src/Core/SettingsChangesHistory.cpp
+++ b/src/Core/SettingsChangesHistory.cpp
@@ -57,265 +57,449 @@ 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.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"},
-              {"merge_tree_min_bytes_per_task_for_remote_reading", 4194304, 2097152, "Value is unified with `filesystem_prefetch_min_bytes_for_single_read_task`"},
-              {"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."},
-              }},
-    {"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.12",
+        {
+        }
+    },
+    {"24.11",
+        {
+        }
+    },
+    {"24.10",
+        {
+        }
+    },
+    {"24.9",
+        {
+        }
+    },
+    {"24.8",
+        {
+            {"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`"},
+            {"allow_archive_path_syntax", true, true, "Added new setting to allow disabling archive path syntax."},
+        }
+    },
+    {"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 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"}
+        }
+    },
 };
 
 
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index 9edc79a1ff1..1b3f81f8547 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -103,7 +103,15 @@ static std::string getSortDescriptionDump(const SortDescription & description, c
     WriteBufferFromOwnString buffer;
 
     for (size_t i = 0; i < description.size(); ++i)
-        buffer << header_types[i]->getName() << ' ' << description[i].direction << ' ' << description[i].nulls_direction;
+    {
+        if (i != 0)
+            buffer << ", ";
+
+        buffer << "(type: " << header_types[i]->getName()
+            << ", direction: " << description[i].direction
+            << ", nulls_direction: " << description[i].nulls_direction
+            << ")";
+    }
 
     return buffer.str();
 }
diff --git a/src/Databases/DatabaseHDFS.cpp b/src/Databases/DatabaseHDFS.cpp
index eccaae5f22e..7fa67a5678e 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 structure 'hdfs://<host_name>:<port>/path'", table_name);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. "
+            "It should have the following 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 ca30ee6db15..3fb6d30fcb8 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_, "data/" + escapeForFileName(name_) + "/", "DatabaseLazy (" + name_ + ")", context_)
+    : DatabaseOnDisk(name_, metadata_path_, std::filesystem::path("data") / escapeForFileName(name_) / "", "DatabaseLazy (" + name_ + ")", context_)
     , expiration_time(expiration_time_)
 {
 }
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index 4347649117d..41cfb751141 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 in memory only cache.
+  * Works like DatabaseOrdinary, but stores in memory only the 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 f419f5811a1..734f354d9a5 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
         {
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 3ab5d3fa697..8808261654f 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -16,6 +16,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -250,6 +251,8 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
 
                 convertMergeTreeToReplicatedIfNeeded(ast, qualified_name, file_name);
 
+                NormalizeSelectWithUnionQueryVisitor::Data data{local_context->getSettingsRef().union_default_mode};
+                NormalizeSelectWithUnionQueryVisitor{data}.visit(ast);
                 std::lock_guard lock{metadata.mutex};
                 metadata.parsed_tables[qualified_name] = ParsedTableMetadata{full_path.string(), ast};
                 metadata.total_dictionaries += create_query->is_dictionary;
diff --git a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
index c928d25c7b8..b471f3fc58f 100644
--- a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
@@ -135,8 +135,11 @@ 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();
 }
 
@@ -158,8 +161,8 @@ void CachedOnDiskReadBufferFromFile::initialize()
 
     LOG_TEST(
         log,
-        "Having {} file segments to read: {}, current offset: {}",
-        file_segments->size(), file_segments->toString(), file_offset_of_buffer_end);
+        "Having {} file segments to read: {}, current read range: [{}, {})",
+        file_segments->size(), file_segments->toString(), file_offset_of_buffer_end, read_until_position);
 
     initialized = true;
 }
@@ -1043,6 +1046,10 @@ 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);
@@ -1055,8 +1062,8 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
 
         chassert(
             file_offset_of_buffer_end <= read_until_position,
-            fmt::format("Expected {} <= {} (size: {}, read range: {})",
-                        file_offset_of_buffer_end, read_until_position, size, current_read_range.toString()));
+            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)));
     }
 
     swap(*implementation_buffer);
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
index bc16955143b..0d92561d142 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -1,3 +1,4 @@
+#include <optional>
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
 #include "Common/Exception.h"
 
@@ -117,7 +118,8 @@ AzureObjectStorage::AzureObjectStorage(
 {
 }
 
-ObjectStorageKey AzureObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
+ObjectStorageKey
+AzureObjectStorage::generateObjectKeyForPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) const
 {
     return ObjectStorageKey::createAsRelative(getRandomASCIIString(32));
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index 2c7ce5e18dc..bc90b05e64d 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 override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) 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 a3b6e25e8ea..fb817005399 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
@@ -34,14 +34,16 @@ FileCache::Key CachedObjectStorage::getCacheKey(const std::string & path) const
     return cache->createKeyForPath(path);
 }
 
-ObjectStorageKey CachedObjectStorage::generateObjectKeyForPath(const std::string & path) const
+ObjectStorageKey
+CachedObjectStorage::generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const
 {
-    return object_storage->generateObjectKeyForPath(path);
+    return object_storage->generateObjectKeyForPath(path, key_prefix);
 }
 
-ObjectStorageKey CachedObjectStorage::generateObjectKeyPrefixForDirectoryPath(const std::string & path) const
+ObjectStorageKey
+CachedObjectStorage::generateObjectKeyPrefixForDirectoryPath(const std::string & path, const std::optional<std::string> & key_prefix) const
 {
-    return object_storage->generateObjectKeyPrefixForDirectoryPath(path);
+    return object_storage->generateObjectKeyPrefixForDirectoryPath(path, key_prefix);
 }
 
 ReadSettings CachedObjectStorage::patchSettings(const ReadSettings & read_settings) const
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
index 93ef2659cbb..efcdbfebabf 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
@@ -98,9 +98,10 @@ public:
 
     const std::string & getCacheName() const override { return cache_config_name; }
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
 
-    ObjectStorageKey generateObjectKeyPrefixForDirectoryPath(const std::string & path) const override;
+    ObjectStorageKey
+    generateObjectKeyPrefixForDirectoryPath(const std::string & path, const std::optional<std::string> & key_prefix) 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 e321c8a3c5a..521d5c037ab 100644
--- a/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.cpp
+++ b/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.cpp
@@ -1,5 +1,7 @@
-#include "CommonPathPrefixKeyGenerator.h"
+#include <Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h>
+#include <Disks/ObjectStorages/InMemoryPathMap.h>
 
+#include <Common/SharedLockGuard.h>
 #include <Common/getRandomASCIIString.h>
 
 #include <deque>
@@ -9,21 +11,22 @@
 namespace DB
 {
 
-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_))
+CommonPathPrefixKeyGenerator::CommonPathPrefixKeyGenerator(String key_prefix_, std::weak_ptr<InMemoryPathMap> path_map_)
+    : storage_key_prefix(key_prefix_), path_map(std::move(path_map_))
 {
 }
 
-ObjectStorageKey CommonPathPrefixKeyGenerator::generate(const String & path, bool is_directory) const
+ObjectStorageKey
+CommonPathPrefixKeyGenerator::generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const
 {
-    const auto & [object_key_prefix, suffix_parts] = getLongestObjectKeyPrefix(path);
+    const auto & [object_key_prefix, suffix_parts]
+        = getLongestObjectKeyPrefix(is_directory ? std::filesystem::path(path).parent_path().string() : path);
 
-    auto key = std::filesystem::path(object_key_prefix.empty() ? storage_key_prefix : object_key_prefix);
+    auto key = std::filesystem::path(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(std::move(key));
+        return ObjectStorageKey::createAsRelative(key_prefix.has_value() ? *key_prefix : storage_key_prefix, std::move(key));
 
     /// File and top-level directory paths are mapped as is.
     if (!is_directory || object_key_prefix.empty())
@@ -39,7 +42,7 @@ ObjectStorageKey CommonPathPrefixKeyGenerator::generate(const String & path, boo
         key /= getRandomASCIIString(part_size);
     }
 
-    return ObjectStorageKey::createAsRelative(key);
+    return ObjectStorageKey::createAsRelative(key_prefix.has_value() ? *key_prefix : storage_key_prefix, key);
 }
 
 std::tuple<std::string, std::vector<std::string>> CommonPathPrefixKeyGenerator::getLongestObjectKeyPrefix(const std::string & path) const
@@ -47,14 +50,13 @@ std::tuple<std::string, std::vector<std::string>> CommonPathPrefixKeyGenerator::
     std::filesystem::path p(path);
     std::deque<std::string> dq;
 
-    std::shared_lock lock(shared_mutex);
-
-    auto ptr = path_map.lock();
+    const auto ptr = path_map.lock();
+    SharedLockGuard lock(ptr->mutex);
 
     while (p != p.root_path())
     {
-        auto it = ptr->find(p / "");
-        if (it != ptr->end())
+        auto it = ptr->map.find(p);
+        if (it != ptr->map.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 fb1140de908..ea91d78600d 100644
--- a/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h
+++ b/src/Disks/ObjectStorages/CommonPathPrefixKeyGenerator.h
@@ -1,14 +1,15 @@
 #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.
 
@@ -18,15 +19,16 @@ 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_, SharedMutex & shared_mutex_, std::weak_ptr<PathMap> path_map_);
+    explicit CommonPathPrefixKeyGenerator(String key_prefix_, std::weak_ptr<InMemoryPathMap> path_map_);
 
-    ObjectStorageKey generate(const String & path, bool is_directory) const override;
+    ObjectStorageKey generate(const String & path, bool is_directory, const std::optional<String> & key_prefix) const override;
 
 private:
     /// Longest key prefix and unresolved parts of the source path.
@@ -34,8 +36,7 @@ private:
 
     const String storage_key_prefix;
 
-    SharedMutex & shared_mutex;
-    std::weak_ptr<PathMap> path_map;
+    std::weak_ptr<InMemoryPathMap> path_map;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
index b5805f6d23a..880911b9958 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);
+            auto object_key = destination_object_storage.generateObjectKeyForPath(to_path, std::nullopt /* key_prefix */);
             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);
+    auto object_key = object_storage.generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
     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);
+    auto object_key = object_storage.generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
     std::optional<ObjectAttributes> object_attributes;
 
     if (metadata_helper)
diff --git a/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.cpp b/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.cpp
new file mode 100644
index 00000000000..0f35bfd2427
--- /dev/null
+++ b/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.cpp
@@ -0,0 +1,51 @@
+#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
new file mode 100644
index 00000000000..4dbac5d3003
--- /dev/null
+++ b/src/Disks/ObjectStorages/FlatDirectoryStructureKeyGenerator.h
@@ -0,0 +1,23 @@
+#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 dcb2af9d4d3..00ef4b63e6f 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 <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
 
@@ -53,7 +53,8 @@ std::string HDFSObjectStorage::extractObjectKeyFromURL(const StoredObject & obje
     return path;
 }
 
-ObjectStorageKey HDFSObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
+ObjectStorageKey
+HDFSObjectStorage::generateObjectKeyForPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) const
 {
     initializeHDFSFS();
     /// what ever data_source_description.description value is, consider that key as relative key
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
index 8aae90d0721..0cb31eb8b8b 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 override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
 
     bool isRemote() const override { return true; }
 
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index ceea4d5a2bb..529c79790fd 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -232,10 +232,11 @@ 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 = 0;
+    virtual ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const = 0;
 
     /// Object key prefix for local paths in the directory 'path'.
-    virtual ObjectStorageKey generateObjectKeyPrefixForDirectoryPath(const std::string & /* path */) const
+    virtual ObjectStorageKey
+    generateObjectKeyPrefixForDirectoryPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) 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
new file mode 100644
index 00000000000..a9859d5e2b8
--- /dev/null
+++ b/src/Disks/ObjectStorages/InMemoryPathMap.h
@@ -0,0 +1,37 @@
+#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 a247d86ddce..5b61c57ca21 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 <Interpreters/Context.h>
-#include <Common/filesystemHelpers.h>
-#include <Common/logger_useful.h>
+#include <filesystem>
+#include <Disks/IO/AsynchronousBoundedReadBuffer.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 <Interpreters/Context.h>
+#include <Common/filesystemHelpers.h>
 #include <Common/getRandomASCIIString.h>
-#include <filesystem>
+#include <Common/logger_useful.h>
 
 namespace fs = std::filesystem;
 
@@ -222,7 +222,8 @@ 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
+ObjectStorageKey
+LocalObjectStorage::generateObjectKeyForPath(const std::string & /* path */, const std::optional<std::string> & /* key_prefix */) 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 371cd37f8b2..564d49bf876 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 override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
 
     bool isRemote() const override { return false; }
 
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
index 30111d04d20..2036208c389 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
@@ -1,5 +1,6 @@
 #include "MetadataStorageFromPlainObjectStorage.h"
 #include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/InMemoryPathMap.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h>
 #include <Disks/ObjectStorages/StaticDirectoryIterator.h>
 
@@ -7,6 +8,7 @@
 
 #include <filesystem>
 #include <tuple>
+#include <unordered_set>
 
 namespace DB
 {
@@ -41,7 +43,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);
+    auto object_key = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
     return object_storage->existsOrHasAnyChild(object_key.serialize());
 }
 
@@ -53,7 +55,7 @@ bool MetadataStorageFromPlainObjectStorage::isFile(const std::string & path) con
 
 bool MetadataStorageFromPlainObjectStorage::isDirectory(const std::string & path) const
 {
-    auto key_prefix = object_storage->generateObjectKeyForPath(path).serialize();
+    auto key_prefix = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */).serialize();
     auto directory = std::filesystem::path(std::move(key_prefix)) / "";
 
     return object_storage->existsOrHasAnyChild(directory);
@@ -61,7 +63,7 @@ bool MetadataStorageFromPlainObjectStorage::isDirectory(const std::string & path
 
 uint64_t MetadataStorageFromPlainObjectStorage::getFileSize(const String & path) const
 {
-    auto object_key = object_storage->generateObjectKeyForPath(path);
+    auto object_key = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
     auto metadata = object_storage->tryGetObjectMetadata(object_key.serialize());
     if (metadata)
         return metadata->size_bytes;
@@ -70,7 +72,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).serialize();
+    auto key_prefix = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */).serialize();
 
     RelativePathsWithMetadata files;
     std::string abs_key = key_prefix;
@@ -79,14 +81,27 @@ std::vector<std::string> MetadataStorageFromPlainObjectStorage::listDirectory(co
 
     object_storage->listObjects(abs_key, files, 0);
 
-    return getDirectChildrenOnDisk(abs_key, files, path);
+    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()));
 }
 
 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));
@@ -95,29 +110,10 @@ 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);
+    auto object_key = object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
     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;
@@ -125,7 +121,7 @@ const IMetadataStorage & MetadataStorageFromPlainObjectStorageTransaction::getSt
 
 void MetadataStorageFromPlainObjectStorageTransaction::unlinkFile(const std::string & path)
 {
-    auto object_key = metadata_storage.object_storage->generateObjectKeyForPath(path);
+    auto object_key = metadata_storage.object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
     auto object = StoredObject(object_key.serialize());
     metadata_storage.object_storage->removeObject(object);
 }
@@ -140,7 +136,7 @@ void MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(const std
     else
     {
         addOperation(std::make_unique<MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation>(
-            normalizeDirectoryPath(path), *metadata_storage.getPathMap(), object_storage));
+            normalizeDirectoryPath(path), *metadata_storage.getPathMap(), object_storage, metadata_storage.getMetadataKeyPrefix()));
     }
 }
 
@@ -150,9 +146,11 @@ 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), std::move(key_prefix), *metadata_storage.getPathMap(), object_storage);
+        std::move(normalized_path),
+        *metadata_storage.getPathMap(),
+        object_storage,
+        metadata_storage.getMetadataKeyPrefix());
     addOperation(std::move(op));
 }
 
@@ -167,7 +165,11 @@ void MetadataStorageFromPlainObjectStorageTransaction::moveDirectory(const std::
         throwNotImplemented();
 
     addOperation(std::make_unique<MetadataStorageFromPlainObjectStorageMoveDirectoryOperation>(
-        normalizeDirectoryPath(path_from), normalizeDirectoryPath(path_to), *metadata_storage.getPathMap(), object_storage));
+        normalizeDirectoryPath(path_from),
+        normalizeDirectoryPath(path_to),
+        *metadata_storage.getPathMap(),
+        object_storage,
+        metadata_storage.getMetadataKeyPrefix()));
 }
 
 void MetadataStorageFromPlainObjectStorageTransaction::addBlobToMetadata(
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
index 66da0f2431e..2aac7158bd5 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
@@ -2,14 +2,18 @@
 
 #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>;
 
@@ -25,10 +29,6 @@ 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,10 +78,11 @@ public:
     bool supportsStat() const override { return false; }
 
 protected:
-    virtual std::shared_ptr<PathMap> getPathMap() const { throwNotImplemented(); }
+    /// Get the object storage prefix for storing metadata files.
+    virtual std::string getMetadataKeyPrefix() const { return object_storage->getCommonKeyPrefix(); }
 
-    virtual std::vector<std::string> getDirectChildrenOnDisk(
-        const std::string & storage_key, const RelativePathsWithMetadata & remote_paths, const std::string & local_path) const;
+    /// Returns a map of virtual filesystem paths to paths in the object storage.
+    virtual std::shared_ptr<InMemoryPathMap> getPathMap() const { throwNotImplemented(); }
 };
 
 class MetadataStorageFromPlainObjectStorageTransaction final : public IMetadataTransaction, private MetadataOperationsHolder
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
index 7e4b1f69962..bfd203ef2e0 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
@@ -1,8 +1,10 @@
 #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
@@ -20,29 +22,45 @@ 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_,
-    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_)
+    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())
 {
+    chassert(path.string().ends_with('/'));
 }
 
 void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::execute(std::unique_lock<SharedMutex> &)
 {
-    if (path_map.contains(path))
-        return;
+    /// 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;
+    }
 
-    LOG_TRACE(getLogger("MetadataStorageFromPlainObjectStorageCreateDirectoryOperation"), "Creating metadata for directory '{}'", path);
+    auto metadata_object_key = createMetadataObjectKey(object_key_prefix, metadata_key_prefix);
 
-    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
+    LOG_TRACE(
+        getLogger("MetadataStorageFromPlainObjectStorageCreateDirectoryOperation"),
+        "Creating metadata for directory '{}' with remote path='{}'",
+        path,
+        metadata_object_key.serialize());
 
-    auto object = StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
+    auto metadata_object = StoredObject(/*remote_path*/ metadata_object_key.serialize(), /*local_path*/ path / PREFIX_PATH_FILE_NAME);
     auto buf = object_storage->writeObject(
-        object,
+        metadata_object,
         WriteMode::Rewrite,
         /* object_attributes */ std::nullopt,
         /* buf_size */ DBMS_DEFAULT_BUFFER_SIZE,
@@ -50,8 +68,12 @@ void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::execute(std:
 
     write_created = true;
 
-    [[maybe_unused]] auto result = path_map.emplace(path, std::move(key_prefix));
-    chassert(result.second);
+    {
+        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);
+    }
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
     CurrentMetrics::add(metric, 1);
 
@@ -66,58 +88,81 @@ void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::execute(std:
 
 void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::undo(std::unique_lock<SharedMutex> &)
 {
-    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
+    auto metadata_object_key = createMetadataObjectKey(object_key_prefix, metadata_key_prefix);
+
     if (write_finalized)
     {
-        path_map.erase(path);
+        const auto base_path = path.parent_path();
+        {
+            std::lock_guard lock(path_map.mutex);
+            path_map.map.erase(base_path);
+        }
         auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
         CurrentMetrics::sub(metric, 1);
 
-        object_storage->removeObject(StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
+        object_storage->removeObject(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
     }
     else if (write_created)
-        object_storage->removeObjectIfExists(StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
+        object_storage->removeObjectIfExists(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
 }
 
 MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::MetadataStorageFromPlainObjectStorageMoveDirectoryOperation(
     std::filesystem::path && path_from_,
     std::filesystem::path && path_to_,
-    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_)
+    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_)
 {
+    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)
 {
-    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);
+    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);
 
-    if (path_map.contains(new_path))
-        throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Metadata object for the new (destination) path '{}' already exists", new_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);
 
-    auto object_key = ObjectStorageKey::createAsRelative(expected_it->second, PREFIX_PATH_FILE_NAME);
+        remote_path = expected_it->second;
+    }
 
-    auto object = StoredObject(object_key.serialize(), expected_path / 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);
 
     if (validate_content)
     {
         std::string data;
-        auto read_buf = object_storage->readObject(object);
+        auto read_buf = object_storage->readObject(metadata_object);
         readStringUntilEOF(data, *read_buf);
         if (data != path_from)
             throw Exception(
                 ErrorCodes::INCORRECT_DATA,
                 "Incorrect data for object key {}, expected {}, got {}",
-                object_key.serialize(),
+                metadata_object_key.serialize(),
                 expected_path,
                 data);
     }
 
     auto write_buf = object_storage->writeObject(
-        object,
+        metadata_object,
         WriteMode::Rewrite,
         /* object_attributes */ std::nullopt,
         /*buf_size*/ DBMS_DEFAULT_BUFFER_SIZE,
@@ -136,8 +181,16 @@ void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::execute(std::u
     writeString(path_to.string(), *write_buf);
     write_buf->finalize();
 
-    [[maybe_unused]] auto result = path_map.emplace(path_to, path_map.extract(path_from).mapped());
-    chassert(result.second);
+    /// 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);
+    }
 
     write_finalized = true;
 }
@@ -145,7 +198,11 @@ void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::execute(std::u
 void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::undo(std::unique_lock<SharedMutex> &)
 {
     if (write_finalized)
-        path_map.emplace(path_from, path_map.extract(path_to).mapped());
+    {
+        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());
+    }
 
     if (write_created)
     {
@@ -156,25 +213,37 @@ void MetadataStorageFromPlainObjectStorageMoveDirectoryOperation::undo(std::uniq
 }
 
 MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation(
-    std::filesystem::path && path_, MetadataStorageFromPlainObjectStorage::PathMap & path_map_, ObjectStoragePtr object_storage_)
-    : path(std::move(path_)), path_map(path_map_), object_storage(object_storage_)
+    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_)
 {
+    chassert(path.string().ends_with('/'));
 }
 
 void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::execute(std::unique_lock<SharedMutex> & /* metadata_lock */)
 {
-    auto path_it = path_map.find(path);
-    if (path_it == path_map.end())
-        return;
+    /// 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;
+    }
 
     LOG_TRACE(getLogger("MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation"), "Removing directory '{}'", 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);
+    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);
+    }
 
-    path_map.erase(path_it);
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
     CurrentMetrics::sub(metric, 1);
 
@@ -189,10 +258,10 @@ void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::undo(std::un
     if (!removed)
         return;
 
-    auto object_key = ObjectStorageKey::createAsRelative(key_prefix, PREFIX_PATH_FILE_NAME);
-    auto object = StoredObject(object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
+    auto metadata_object_key = createMetadataObjectKey(key_prefix, metadata_key_prefix);
+    auto metadata_object = StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME);
     auto buf = object_storage->writeObject(
-        object,
+        metadata_object,
         WriteMode::Rewrite,
         /* object_attributes */ std::nullopt,
         /* buf_size */ DBMS_DEFAULT_BUFFER_SIZE,
@@ -200,7 +269,11 @@ void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::undo(std::un
     writeString(path.string(), *buf);
     buf->finalize();
 
-    path_map.emplace(path, std::move(key_prefix));
+    {
+        std::lock_guard lock(path_map.mutex);
+        auto & map = path_map.map;
+        map.emplace(path.parent_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 4b196f787fd..93ebe668d56 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Disks/ObjectStorages/IMetadataOperation.h>
+#include <Disks/ObjectStorages/InMemoryPathMap.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
 
 #include <filesystem>
@@ -13,20 +14,21 @@ class MetadataStorageFromPlainObjectStorageCreateDirectoryOperation final : publ
 {
 private:
     std::filesystem::path path;
-    std::string key_prefix;
-    MetadataStorageFromPlainObjectStorage::PathMap & path_map;
+    InMemoryPathMap & 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_,
-        std::string && key_prefix_,
-        MetadataStorageFromPlainObjectStorage::PathMap & path_map_,
-        ObjectStoragePtr object_storage_);
+        InMemoryPathMap & path_map_,
+        ObjectStoragePtr object_storage_,
+        const std::string & metadata_key_prefix_);
 
     void execute(std::unique_lock<SharedMutex> & metadata_lock) override;
     void undo(std::unique_lock<SharedMutex> & metadata_lock) override;
@@ -37,8 +39,9 @@ class MetadataStorageFromPlainObjectStorageMoveDirectoryOperation final : public
 private:
     std::filesystem::path path_from;
     std::filesystem::path path_to;
-    MetadataStorageFromPlainObjectStorage::PathMap & path_map;
+    InMemoryPathMap & path_map;
     ObjectStoragePtr object_storage;
+    const std::string metadata_key_prefix;
 
     bool write_created = false;
     bool write_finalized = false;
@@ -48,10 +51,12 @@ private:
 
 public:
     MetadataStorageFromPlainObjectStorageMoveDirectoryOperation(
+        /// Both path_from_ and path_to_ must end with a trailing '/'.
         std::filesystem::path && path_from_,
         std::filesystem::path && path_to_,
-        MetadataStorageFromPlainObjectStorage::PathMap & path_map_,
-        ObjectStoragePtr object_storage_);
+        InMemoryPathMap & path_map_,
+        ObjectStoragePtr object_storage_,
+        const std::string & metadata_key_prefix_);
 
     void execute(std::unique_lock<SharedMutex> & metadata_lock) override;
 
@@ -63,15 +68,20 @@ class MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation final : publ
 private:
     std::filesystem::path path;
 
-    MetadataStorageFromPlainObjectStorage::PathMap & path_map;
+    InMemoryPathMap & path_map;
     ObjectStoragePtr object_storage;
+    const std::string metadata_key_prefix;
 
     std::string key_prefix;
     bool removed = false;
 
 public:
     MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation(
-        std::filesystem::path && path_, MetadataStorageFromPlainObjectStorage::PathMap & path_map_, ObjectStoragePtr object_storage_);
+        /// path_ must end with a trailing '/'.
+        std::filesystem::path && path_,
+        InMemoryPathMap & path_map_,
+        ObjectStoragePtr object_storage_,
+        const std::string & metadata_key_prefix_);
 
     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 7718fba9c28..39b11d9a3e3 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.cpp
@@ -1,9 +1,14 @@
+#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/SharedThreadPools.h>
 #include <IO/S3Common.h>
+#include <IO/SharedThreadPools.h>
+#include "Common/SharedLockGuard.h"
+#include "Common/SharedMutex.h"
 #include <Common/ErrorCodes.h>
 #include <Common/logger_useful.h>
 #include "CommonPathPrefixKeyGenerator.h"
@@ -21,14 +26,28 @@ namespace
 {
 
 constexpr auto PREFIX_PATH_FILE_NAME = "prefix.path";
+constexpr auto METADATA_PATH_TOKEN = "__meta/";
 
-MetadataStorageFromPlainObjectStorage::PathMap loadPathPrefixMap(const std::string & root, ObjectStoragePtr object_storage)
+/// 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 result;
+    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;
 
     ThreadPool & pool = getIOThreadPool().get();
     ThreadPoolCallbackRunnerLocal<void> runner(pool, "PlainRWMetaLoad");
-    std::mutex mutex;
 
     LoggerPtr log = getLogger("MetadataStorageFromPlainObjectStorage");
 
@@ -39,102 +58,107 @@ MetadataStorageFromPlainObjectStorage::PathMap loadPathPrefixMap(const std::stri
 
     LOG_DEBUG(log, "Loading metadata");
     size_t num_files = 0;
-    for (auto iterator = object_storage->iterate(root, 0); iterator->isValid(); iterator->next())
+    for (auto iterator = object_storage->iterate(metadata_key_prefix, 0); iterator->isValid(); iterator->next())
     {
         ++num_files;
         auto file = iterator->current();
         String path = file->getPath();
-        auto remote_path = std::filesystem::path(path);
-        if (remote_path.filename() != PREFIX_PATH_FILE_NAME)
+        auto remote_metadata_path = std::filesystem::path(path);
+        if (remote_metadata_path.filename() != PREFIX_PATH_FILE_NAME)
             continue;
 
-        runner([remote_path, path, &object_storage, &result, &mutex, &log, &settings]
-        {
-            setThreadName("PlainRWMetaLoad");
-
-            StoredObject object{path};
-            String local_path;
-
-            try
+        runner(
+            [remote_metadata_path, path, &object_storage, &result, &log, &settings, &metadata_key_prefix]
             {
-                auto read_buf = object_storage->readObject(object, settings);
-                readStringUntilEOF(local_path, *read_buf);
-            }
+                setThreadName("PlainRWMetaLoad");
+
+                StoredObject object{path};
+                String local_path;
+
+                try
+                {
+                    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_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());
-            }
+                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());
+                }
 
-            /// 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();
-    LOG_DEBUG(log, "Loaded metadata for {} files, found {} directories", num_files, result.size());
+    {
+        SharedLockGuard lock(result->mutex);
+        LOG_DEBUG(log, "Loaded metadata for {} files, found {} directories", num_files, result->map.size());
 
-    auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
-    CurrentMetrics::add(metric, result.size());
+        auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
+        CurrentMetrics::add(metric, result->map.size());
+    }
     return result;
 }
 
-std::vector<std::string> getDirectChildrenOnRewritableDisk(
+void getDirectChildrenOnDiskImpl(
     const std::string & storage_key,
     const RelativePathsWithMetadata & remote_paths,
     const std::string & local_path,
-    const MetadataStorageFromPlainObjectStorage::PathMap & local_path_prefixes,
-    SharedMutex & shared_mutex)
+    const InMemoryPathMap & path_map,
+    std::unordered_set<std::string> & result)
 {
-    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;
-
+    /// Directories are retrieved from the in-memory path map.
     {
-        std::shared_lock lock(shared_mutex);
-        auto end_it = local_path_prefixes.end();
+        SharedLockGuard lock(path_map.mutex);
+        const auto & local_path_prefixes = path_map.map;
+        const auto end_it = local_path_prefixes.end();
         for (auto it = local_path_prefixes.lower_bound(local_path); it != end_it; ++it)
         {
-            const auto & [k, v] = std::make_tuple(it->first.string(), it->second);
+            const auto & [k, _] = 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(), '/');
-            if (slash_num != 1)
-                continue;
+            /// 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;
 
-            chassert(k.back() == '/');
-            remote_to_local_subdir.emplace(v, std::string(k.begin() + local_path.size(), k.end() - 1));
+            result.emplace(std::string(k.begin() + local_path.size(), k.end()) + "/");
         }
     }
 
+    /// Files.
     auto skip_list = std::set<std::string>{PREFIX_PATH_FILE_NAME};
     for (const auto & elem : remote_paths)
     {
@@ -149,22 +173,9 @@ std::vector<std::string> getDirectChildrenOnRewritableDisk(
             /// File names.
             auto filename = path.substr(child_pos);
             if (!skip_list.contains(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));
+                result.emplace(std::move(filename));
         }
     }
-
-    return std::vector<std::string>(std::make_move_iterator(duplicates_filter.begin()), std::make_move_iterator(duplicates_filter.end()));
 }
 
 }
@@ -172,7 +183,8 @@ std::vector<std::string> getDirectChildrenOnRewritableDisk(
 MetadataStorageFromPlainRewritableObjectStorage::MetadataStorageFromPlainRewritableObjectStorage(
     ObjectStoragePtr object_storage_, String storage_path_prefix_)
     : MetadataStorageFromPlainObjectStorage(object_storage_, storage_path_prefix_)
-    , path_map(std::make_shared<PathMap>(loadPathPrefixMap(object_storage->getCommonKeyPrefix(), object_storage)))
+    , metadata_key_prefix(DB::getMetadataKeyPrefix(object_storage))
+    , path_map(loadPathPrefixMap(metadata_key_prefix, object_storage))
 {
     if (object_storage->isWriteOnce())
         throw Exception(
@@ -180,20 +192,85 @@ MetadataStorageFromPlainRewritableObjectStorage::MetadataStorageFromPlainRewrita
             "MetadataStorageFromPlainRewritableObjectStorage is not compatible with write-once storage '{}'",
             object_storage->getName());
 
-    auto keys_gen = std::make_shared<CommonPathPrefixKeyGenerator>(object_storage->getCommonKeyPrefix(), metadata_mutex, path_map);
-    object_storage->setKeysGenerator(keys_gen);
+    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);
+    }
 }
 
 MetadataStorageFromPlainRewritableObjectStorage::~MetadataStorageFromPlainRewritableObjectStorage()
 {
     auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
-    CurrentMetrics::sub(metric, path_map->size());
+    CurrentMetrics::sub(metric, path_map->map.size());
 }
 
-std::vector<std::string> MetadataStorageFromPlainRewritableObjectStorage::getDirectChildrenOnDisk(
-    const std::string & storage_key, const RelativePathsWithMetadata & remote_paths, const std::string & local_path) const
+bool MetadataStorageFromPlainRewritableObjectStorage::exists(const std::string & path) const
 {
-    return getDirectChildrenOnRewritableDisk(storage_key, remote_paths, local_path, *getPathMap(), metadata_mutex);
+    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;
 }
 
+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 a5394b9428d..82d93e3e7ae 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainRewritableObjectStorage.h
@@ -3,6 +3,7 @@
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
 
 #include <memory>
+#include <unordered_set>
 
 
 namespace DB
@@ -11,18 +12,29 @@ namespace DB
 class MetadataStorageFromPlainRewritableObjectStorage final : public MetadataStorageFromPlainObjectStorage
 {
 private:
-    std::shared_ptr<PathMap> path_map;
+    const std::string metadata_key_prefix;
+    std::shared_ptr<InMemoryPathMap> 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::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;
+    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;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/PlainObjectStorage.h b/src/Disks/ObjectStorages/PlainObjectStorage.h
index e0907d0b4d8..805b3436fce 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 override
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & /* key_prefix */) const override
     {
         return ObjectStorageKey::createAsRelative(BaseObjectStorage::getCommonKeyPrefix(), path);
     }
diff --git a/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h b/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h
index 5f000afe625..dcea5964fc5 100644
--- a/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h
+++ b/src/Disks/ObjectStorages/PlainRewritableObjectStorage.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <optional>
+#include <string>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/ObjectStorageKeyGenerator.h>
 #include "CommonPathPrefixKeyGenerator.h"
@@ -33,9 +35,10 @@ public:
 
     bool isPlain() const override { return true; }
 
-    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
 
-    ObjectStorageKey generateObjectKeyPrefixForDirectoryPath(const std::string & path) const override;
+    ObjectStorageKey
+    generateObjectKeyPrefixForDirectoryPath(const std::string & path, const std::optional<std::string> & key_prefix) const override;
 
     void setKeysGenerator(ObjectStorageKeysGeneratorPtr gen) override { key_generator = gen; }
 
@@ -46,20 +49,22 @@ private:
 
 
 template <typename BaseObjectStorage>
-ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyForPath(const std::string & path) const
+ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyForPath(
+    const std::string & path, const std::optional<std::string> & key_prefix) const
 {
     if (!key_generator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Key generator is not set");
 
-    return key_generator->generate(path, /* is_directory */ false);
+    return key_generator->generate(path, /* is_directory */ false, key_prefix);
 }
 
 template <typename BaseObjectStorage>
-ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyPrefixForDirectoryPath(const std::string & path) const
+ObjectStorageKey PlainRewritableObjectStorage<BaseObjectStorage>::generateObjectKeyPrefixForDirectoryPath(
+    const std::string & path, const std::optional<std::string> & key_prefix) const
 {
     if (!key_generator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Key generator is not set");
 
-    return key_generator->generate(path, /* is_directory */ true);
+    return key_generator->generate(path, /* is_directory */ true, key_prefix);
 }
 }
diff --git a/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp b/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
index 63e7ebb00c5..b20a2940e47 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);
+    const auto key = storage.generateObjectKeyForPath(path, {} /* key_prefix */);
     StoredObject object(key.serialize(), path);
     try
     {
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index a6672e14e10..3c4b4d76bf5 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -624,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
+ObjectStorageKey S3ObjectStorage::generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const
 {
     if (!key_generator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Key generator is not set");
 
-    return key_generator->generate(path, /* is_directory */ false);
+    return key_generator->generate(path, /* is_directory */ false, key_prefix);
 }
 
 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 cbe004bc298..d786a6b37f3 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 override;
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) 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 9ca2950dae0..ab357d6f50d 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 override
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & /* key_prefix */) const override
     {
         return ObjectStorageKey::createAsRelative(path);
     }
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 15fcbf2b1b8..68946c895bb 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -123,6 +123,7 @@ 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;
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 225d03e54fd..72104518ecc 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -205,6 +205,7 @@ struct FormatSettings
 
     struct JSON
     {
+        size_t max_depth = 1000;
         bool array_of_rows = false;
         bool quote_64bit_integers = true;
         bool quote_64bit_floats = false;
diff --git a/src/Functions/CountSubstringsImpl.h b/src/Functions/CountSubstringsImpl.h
index 9ff3e4e1f2a..b1cefae6f1d 100644
--- a/src/Functions/CountSubstringsImpl.h
+++ b/src/Functions/CountSubstringsImpl.h
@@ -37,10 +37,11 @@ struct CountSubstringsImpl
         const std::string & needle,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
         const UInt8 * const begin = haystack_data.data();
         const UInt8 * const end = haystack_data.data() + haystack_data.size();
@@ -80,6 +81,8 @@ struct CountSubstringsImpl
             }
             pos = begin + haystack_offsets[i];
             ++i;
+
+            chassert(i < input_rows_count);
         }
     }
 
@@ -115,7 +118,7 @@ struct CountSubstringsImpl
         [[maybe_unused]] ColumnUInt8 * res_null)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
         Impl::toLowerIfNeed(haystack);
         Impl::toLowerIfNeed(needle);
@@ -150,17 +153,18 @@ struct CountSubstringsImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
+        chassert(input_rows_count == haystack_offsets.size());
+
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
         ColumnString::Offset prev_haystack_offset = 0;
         ColumnString::Offset prev_needle_offset = 0;
 
-        size_t size = haystack_offsets.size();
-
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
             size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -207,17 +211,18 @@ struct CountSubstringsImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
+        chassert(input_rows_count == needle_offsets.size());
+
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
         /// NOTE You could use haystack indexing. But this is a rare case.
         ColumnString::Offset prev_needle_offset = 0;
 
-        size_t size = needle_offsets.size();
-
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             res[i] = 0;
             auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1);
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 86cedbdec30..6f0bdf406db 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -24,7 +24,7 @@ namespace DB
 
 static constexpr auto millisecond_multiplier = 1'000;
 static constexpr auto microsecond_multiplier = 1'000'000;
-static constexpr auto nanosecond_multiplier  = 1'000'000'000;
+static constexpr auto nanosecond_multiplier = 1'000'000'000;
 
 static constexpr FormatSettings::DateTimeOverflowBehavior default_date_time_overflow_behavior = FormatSettings::DateTimeOverflowBehavior::Ignore;
 
@@ -381,11 +381,13 @@ struct ToStartOfWeekImpl
 
     static UInt16 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
+        const int res = time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
+        return std::max(res, 0);
     }
     static UInt16 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
-        return time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
+        const int res = time_zone.toFirstDayNumOfWeek(time_zone.toDayNum(t), week_mode);
+        return std::max(res, 0);
     }
     static UInt16 execute(Int32 d, UInt8 week_mode, const DateLUTImpl & time_zone)
     {
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index a92a6570279..8346380c35d 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,14 +114,16 @@ 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);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
+                input_rows_count);
         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);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
+                input_rows_count);
 
         // 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 03db2651fd0..6bcc8581a38 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,13 +110,15 @@ 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);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
+                input_rows_count);
         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);
+                allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps,
+                input_rows_count);
 
         // the combination of const haystack + const needle is not implemented because
         // useDefaultImplementationForConstants() == true makes upper layers convert both to
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index fba6336ebff..7ec0076e395 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,7 +236,8 @@ public:
                 col_needle_vector->getOffsets(),
                 column_start_pos,
                 vec_res,
-                null_map.get());
+                null_map.get(),
+                input_rows_count);
         else if (col_haystack_vector && col_needle_const)
             Impl::vectorConstant(
                 col_haystack_vector->getChars(),
@@ -244,7 +245,8 @@ public:
                 col_needle_const->getValue<String>(),
                 column_start_pos,
                 vec_res,
-                null_map.get());
+                null_map.get(),
+                input_rows_count);
         else if (col_haystack_vector_fixed && col_needle_vector)
             Impl::vectorFixedVector(
                 col_haystack_vector_fixed->getChars(),
@@ -253,14 +255,16 @@ public:
                 col_needle_vector->getOffsets(),
                 column_start_pos,
                 vec_res,
-                null_map.get());
+                null_map.get(),
+                input_rows_count);
         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());
+                null_map.get(),
+                input_rows_count);
         else if (col_haystack_const && col_needle_vector)
             Impl::constantVector(
                 col_haystack_const->getValue<String>(),
@@ -268,7 +272,8 @@ public:
                 col_needle_vector->getOffsets(),
                 column_start_pos,
                 vec_res,
-                null_map.get());
+                null_map.get(),
+                input_rows_count);
         else
             throw Exception(
                 ErrorCodes::ILLEGAL_COLUMN,
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index 978a84de472..c889cf062a3 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);
+            Impl::vector(col->getChars(), col->getOffsets(), col_needle->getValue<String>(), vec_res, offsets_res, input_rows_count);
 
             return col_res;
         }
diff --git a/src/Functions/FunctionsVisitParam.h b/src/Functions/FunctionsVisitParam.h
index 5e13fbbad5c..a77fa740f9c 100644
--- a/src/Functions/FunctionsVisitParam.h
+++ b/src/Functions/FunctionsVisitParam.h
@@ -93,7 +93,8 @@ struct ExtractParamImpl
         std::string needle,
         const ColumnPtr & start_pos,
         PaddedPODArray<ResultType> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t /*input_rows_count*/)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -168,11 +169,12 @@ 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)
+                       ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
+                       size_t input_rows_count)
     {
         /// 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(haystack_offsets.size());
+        res_offsets.resize(input_rows_count);
 
         /// 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 a4ff49859cc..4943bf708c5 100644
--- a/src/Functions/HasTokenImpl.h
+++ b/src/Functions/HasTokenImpl.h
@@ -35,12 +35,13 @@ struct HasTokenImpl
         const std::string & pattern,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt8> & res,
-        ColumnUInt8 * res_null)
+        ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         if (start_pos != nullptr)
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' does not support start_pos argument", name);
 
-        if (haystack_offsets.empty())
+        if (input_rows_count == 0)
             return;
 
         const UInt8 * const begin = haystack_data.data();
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 55b2fee5400..7dc93ba79e0 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)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
-        const size_t haystack_size = haystack_offsets.size();
+        chassert(res.size() == haystack_offsets.size());
+        chassert(res.size() == input_rows_count);
+        chassert(start_pos_ == nullptr);
 
-        assert(haystack_size == res.size());
-        assert(start_pos_ == nullptr);
-
-        if (haystack_offsets.empty())
+        if (input_rows_count == 0)
             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, haystack_size * sizeof(res[0]));
+                memset(res.data(), !negate, input_rows_count * sizeof(res[0]));
             else
             {
                 size_t prev_offset = 0;
-                for (size_t i = 0; i < haystack_size; ++i)
+                for (size_t i = 0; i < input_rows_count; ++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)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
-        const size_t haystack_size = haystack.size() / N;
+        chassert(res.size() == haystack.size() / N);
+        chassert(res.size() == input_rows_count);
 
-        assert(haystack_size == res.size());
-
-        if (haystack.empty())
+        if (input_rows_count == 0)
             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, haystack_size * sizeof(res[0]));
+                memset(res.data(), !negate, input_rows_count * sizeof(res[0]));
             else
             {
                 size_t offset = 0;
-                for (size_t i = 0; i < haystack_size; ++i)
+                for (size_t i = 0; i < input_rows_count; ++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)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
-        const size_t haystack_size = haystack_offsets.size();
+        chassert(haystack_offsets.size() == needle_offset.size());
+        chassert(res.size() == haystack_offsets.size());
+        chassert(res.size() == input_rows_count);
+        chassert(start_pos_ == nullptr);
 
-        assert(haystack_size == needle_offset.size());
-        assert(haystack_size == res.size());
-        assert(start_pos_ == nullptr);
-
-        if (haystack_offsets.empty())
+        if (input_rows_count == 0)
             return;
 
         String required_substr;
@@ -488,7 +488,7 @@ struct MatchImpl
         Regexps::LocalCacheTable cache;
         Regexps::RegexpPtr regexp;
 
-        for (size_t i = 0; i < haystack_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++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)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
-        assert(!res_null);
+        chassert(!res_null);
 
-        const size_t haystack_size = haystack.size()/N;
-
-        assert(haystack_size == needle_offset.size());
-        assert(haystack_size == res.size());
-        assert(start_pos_ == nullptr);
+        chassert(res.size() == input_rows_count);
+        chassert(res.size() == haystack.size() / N);
+        chassert(res.size() == needle_offset.size());
+        chassert(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 < haystack_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++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 3e9c8fba215..3aeac808880 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -52,9 +52,10 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t 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);
+        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);
     }
 
     static void vectorConstant(
@@ -67,7 +68,8 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t input_rows_count)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
@@ -87,7 +89,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(haystack_offsets.size());
+        offsets.resize(input_rows_count);
 
         if (needles_arr.empty())
         {
@@ -114,9 +116,8 @@ 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 < haystack_offsets_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             UInt64 length = haystack_offsets[i] - offset - 1;
             /// vectorscan restriction.
@@ -146,6 +147,7 @@ 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
     }
@@ -160,9 +162,10 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t 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);
+        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);
     }
 
     static void vectorVector(
@@ -176,12 +179,13 @@ struct MultiMatchAllIndicesImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t input_rows_count)
     {
         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(haystack_offsets.size());
+        offsets.resize(input_rows_count);
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
 
@@ -189,7 +193,7 @@ struct MultiMatchAllIndicesImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < haystack_offsets.size(); ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
@@ -271,6 +275,7 @@ 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 20b2150048b..fda752cbacc 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -66,9 +66,10 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t 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);
+        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);
     }
 
     static void vectorConstant(
@@ -81,7 +82,8 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t input_rows_count)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
@@ -101,7 +103,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(haystack_offsets.size());
+        res.resize(input_rows_count);
 
         if (needles_arr.empty())
         {
@@ -133,9 +135,8 @@ 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 < haystack_offsets_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             UInt64 length = haystack_offsets[i] - offset - 1;
             /// vectorscan restriction.
@@ -164,7 +165,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);
+            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);
             for (size_t i = 0; i < res.size(); ++i)
             {
                 if constexpr (FindAny)
@@ -186,9 +187,10 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t 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);
+        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);
     }
 
     static void vectorVector(
@@ -202,12 +204,13 @@ struct MultiMatchAnyImpl
         bool allow_hyperscan,
         size_t max_hyperscan_regexp_length,
         size_t max_hyperscan_regexp_total_length,
-        bool reject_expensive_hyperscan_regexps)
+        bool reject_expensive_hyperscan_regexps,
+        size_t input_rows_count)
     {
         if (!allow_hyperscan)
             throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0");
 
-        res.resize(haystack_offsets.size());
+        res.resize(input_rows_count);
 #if USE_VECTORSCAN
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -216,7 +219,7 @@ struct MultiMatchAnyImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < haystack_offsets.size(); ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
@@ -306,7 +309,7 @@ struct MultiMatchAnyImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < haystack_offsets.size(); ++i)
+        for (size_t i = 0; i < input_rows_count; ++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/MultiSearchFirstIndexImpl.h b/src/Functions/MultiSearchFirstIndexImpl.h
index 36a5fd514d9..5b34dbfe601 100644
--- a/src/Functions/MultiSearchFirstIndexImpl.h
+++ b/src/Functions/MultiSearchFirstIndexImpl.h
@@ -33,7 +33,8 @@ struct MultiSearchFirstIndexImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/)
+        bool /*reject_expensive_hyperscan_regexps*/,
+        size_t input_rows_count)
     {
         // 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())
@@ -48,14 +49,13 @@ struct MultiSearchFirstIndexImpl
 
         auto searcher = Impl::createMultiSearcherInBigHaystack(needles);
 
-        const size_t haystack_size = haystack_offsets.size();
-        res.resize(haystack_size);
+        res.resize(input_rows_count);
 
         size_t iteration = 0;
         while (searcher.hasMoreToSearch())
         {
             size_t prev_haystack_offset = 0;
-            for (size_t j = 0; j < haystack_size; ++j)
+            for (size_t j = 0; j < input_rows_count; ++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*/)
+        bool /*reject_expensive_hyperscan_regexps*/,
+        size_t input_rows_count)
     {
-        const size_t haystack_size = haystack_offsets.size();
-        res.resize(haystack_size);
+        res.resize(input_rows_count);
 
         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 < haystack_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             needles.reserve(needles_offsets[i] - prev_needles_offset);
 
diff --git a/src/Functions/MultiSearchFirstPositionImpl.h b/src/Functions/MultiSearchFirstPositionImpl.h
index ccdd82a0ee5..06bf7aa94d8 100644
--- a/src/Functions/MultiSearchFirstPositionImpl.h
+++ b/src/Functions/MultiSearchFirstPositionImpl.h
@@ -33,7 +33,8 @@ struct MultiSearchFirstPositionImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/)
+        bool /*reject_expensive_hyperscan_regexps*/,
+        size_t input_rows_count)
     {
         // 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())
@@ -52,14 +53,13 @@ struct MultiSearchFirstPositionImpl
         };
         auto searcher = Impl::createMultiSearcherInBigHaystack(needles);
 
-        const size_t haystack_size = haystack_offsets.size();
-        res.resize(haystack_size);
+        res.resize(input_rows_count);
 
         size_t iteration = 0;
         while (searcher.hasMoreToSearch())
         {
             size_t prev_haystack_offset = 0;
-            for (size_t j = 0; j < haystack_size; ++j)
+            for (size_t j = 0; j < input_rows_count; ++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*/)
+        bool /*reject_expensive_hyperscan_regexps*/,
+        size_t input_rows_count)
     {
-        const size_t haystack_size = haystack_offsets.size();
-        res.resize(haystack_size);
+        res.resize(input_rows_count);
 
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -106,14 +106,12 @@ struct MultiSearchFirstPositionImpl
             return 1 + Impl::countChars(reinterpret_cast<const char *>(start), reinterpret_cast<const char *>(end));
         };
 
-        for (size_t i = 0; i < haystack_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++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 467cc96a95f..909425f5a93 100644
--- a/src/Functions/MultiSearchImpl.h
+++ b/src/Functions/MultiSearchImpl.h
@@ -33,7 +33,8 @@ struct MultiSearchImpl
         bool /*allow_hyperscan*/,
         size_t /*max_hyperscan_regexp_length*/,
         size_t /*max_hyperscan_regexp_total_length*/,
-        bool /*reject_expensive_hyperscan_regexps*/)
+        bool /*reject_expensive_hyperscan_regexps*/,
+        size_t input_rows_count)
     {
         // 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())
@@ -48,14 +49,13 @@ struct MultiSearchImpl
 
         auto searcher = Impl::createMultiSearcherInBigHaystack(needles);
 
-        const size_t haystack_size = haystack_offsets.size();
-        res.resize(haystack_size);
+        res.resize(input_rows_count);
 
         size_t iteration = 0;
         while (searcher.hasMoreToSearch())
         {
             size_t prev_haystack_offset = 0;
-            for (size_t j = 0; j < haystack_size; ++j)
+            for (size_t j = 0; j < input_rows_count; ++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*/)
+        bool /*reject_expensive_hyperscan_regexps*/,
+        size_t input_rows_count)
     {
-        const size_t haystack_size = haystack_offsets.size();
-        res.resize(haystack_size);
+        res.resize(input_rows_count);
 
         size_t prev_haystack_offset = 0;
         size_t prev_needles_offset = 0;
@@ -91,14 +91,12 @@ struct MultiSearchImpl
 
         std::vector<std::string_view> needles;
 
-        for (size_t i = 0; i < haystack_size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++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/PositionImpl.h b/src/Functions/PositionImpl.h
index eeb9d8b6a59..e525b5fab57 100644
--- a/src/Functions/PositionImpl.h
+++ b/src/Functions/PositionImpl.h
@@ -193,7 +193,8 @@ struct PositionImpl
         const std::string & needle,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -214,13 +215,12 @@ 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 < rows; ++i)
+                for (size_t i = 0; i < input_rows_count; ++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 < rows; ++i)
+                for (size_t i = 0; i < input_rows_count; ++i)
                 {
                     size_t haystack_size = Impl::countChars(
                         reinterpret_cast<const char *>(pos), reinterpret_cast<const char *>(pos + haystack_offsets[i] - prev_offset - 1));
@@ -359,7 +359,8 @@ struct PositionImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -367,9 +368,7 @@ struct PositionImpl
         ColumnString::Offset prev_haystack_offset = 0;
         ColumnString::Offset prev_needle_offset = 0;
 
-        size_t size = haystack_offsets.size();
-
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
             size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
@@ -423,7 +422,8 @@ struct PositionImpl
         const ColumnString::Offsets & needle_offsets,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt64> & res,
-        [[maybe_unused]] ColumnUInt8 * res_null)
+        [[maybe_unused]] ColumnUInt8 * res_null,
+        size_t input_rows_count)
     {
         /// `res_null` serves as an output parameter for implementing an XYZOrNull variant.
         assert(!res_null);
@@ -431,9 +431,7 @@ struct PositionImpl
         /// NOTE You could use haystack indexing. But this is a rare case.
         ColumnString::Offset prev_needle_offset = 0;
 
-        size_t size = needle_offsets.size();
-
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
 
diff --git a/src/Functions/URL/extractURLParameter.cpp b/src/Functions/URL/extractURLParameter.cpp
index f75875e0200..590c2779d9c 100644
--- a/src/Functions/URL/extractURLParameter.cpp
+++ b/src/Functions/URL/extractURLParameter.cpp
@@ -10,10 +10,11 @@ struct ExtractURLParameterImpl
     static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         std::string pattern,
-        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets)
+        ColumnString::Chars & res_data, ColumnString::Offsets & res_offsets,
+        size_t input_rows_count)
     {
         res_data.reserve(data.size() / 5);
-        res_offsets.resize(offsets.size());
+        res_offsets.resize(input_rows_count);
 
         pattern += '=';
         const char * param_str = pattern.c_str();
@@ -22,7 +23,7 @@ struct ExtractURLParameterImpl
         ColumnString::Offset prev_offset = 0;
         ColumnString::Offset res_offset = 0;
 
-        for (size_t i = 0; i < offsets.size(); ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             ColumnString::Offset cur_offset = offsets[i];
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp b/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
index e6796874e50..d0bc812f91d 100644
--- a/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
@@ -2,6 +2,7 @@
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Backups/RestorerFromBackup.h>
+#include <Core/Settings.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/UserDefined/IUserDefinedSQLObjectsStorage.h>
 #include <Functions/UserDefined/UserDefinedExecutableFunctionFactory.h>
@@ -9,6 +10,7 @@
 #include <Functions/UserDefined/UserDefinedSQLObjectsBackup.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
 #include <Parsers/ASTCreateFunctionQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
@@ -80,13 +82,15 @@ namespace
         validateFunctionRecursiveness(*function_body, name);
     }
 
-    ASTPtr normalizeCreateFunctionQuery(const IAST & create_function_query)
+    ASTPtr normalizeCreateFunctionQuery(const IAST & create_function_query, const ContextPtr & context)
     {
         auto ptr = create_function_query.clone();
         auto & res = typeid_cast<ASTCreateFunctionQuery &>(*ptr);
         res.if_not_exists = false;
         res.or_replace = false;
         FunctionNameNormalizer::visit(res.function_core.get());
+        NormalizeSelectWithUnionQueryVisitor::Data data{context->getSettingsRef().union_default_mode};
+        NormalizeSelectWithUnionQueryVisitor{data}.visit(res.function_core);
         return ptr;
     }
 }
@@ -125,7 +129,7 @@ void UserDefinedSQLFunctionFactory::checkCanBeUnregistered(const ContextPtr & co
 bool UserDefinedSQLFunctionFactory::registerFunction(const ContextMutablePtr & context, const String & function_name, ASTPtr create_function_query, bool throw_if_exists, bool replace_if_exists)
 {
     checkCanBeRegistered(context, function_name, *create_function_query);
-    create_function_query = normalizeCreateFunctionQuery(*create_function_query);
+    create_function_query = normalizeCreateFunctionQuery(*create_function_query, context);
 
     try
     {
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
index 4c004d2537c..8910b45e79d 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
@@ -1,7 +1,7 @@
 #include "Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h"
 
-#include "Functions/UserDefined/UserDefinedSQLFunctionFactory.h"
-#include "Functions/UserDefined/UserDefinedSQLObjectType.h"
+#include <Functions/UserDefined/UserDefinedSQLObjectType.h>
+#include <Functions/UserDefined/UserDefinedSQLObjectsStorageBase.h>
 
 #include <Common/StringUtils.h>
 #include <Common/atomicRename.h>
@@ -54,7 +54,7 @@ namespace
 }
 
 UserDefinedSQLObjectsDiskStorage::UserDefinedSQLObjectsDiskStorage(const ContextPtr & global_context_, const String & dir_path_)
-    : global_context(global_context_)
+    : UserDefinedSQLObjectsStorageBase(global_context_)
     , dir_path{makeDirectoryPathCanonical(dir_path_)}
     , log{getLogger("UserDefinedSQLObjectsLoaderFromDisk")}
 {
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h
index ae0cbd0c589..cafbd140598 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h
@@ -42,7 +42,6 @@ private:
     ASTPtr tryLoadObject(UserDefinedSQLObjectType object_type, const String & object_name, const String & file_path, bool check_file_exists);
     String getFilePath(UserDefinedSQLObjectType object_type, const String & object_name) const;
 
-    ContextPtr global_context;
     String dir_path;
     LoggerPtr log;
     std::atomic<bool> objects_loaded = false;
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp
index f251d11789f..225e919301d 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp
@@ -2,7 +2,10 @@
 
 #include <boost/container/flat_set.hpp>
 
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
 #include <Parsers/ASTCreateFunctionQuery.h>
 
 namespace DB
@@ -17,18 +20,24 @@ namespace ErrorCodes
 namespace
 {
 
-ASTPtr normalizeCreateFunctionQuery(const IAST & create_function_query)
+ASTPtr normalizeCreateFunctionQuery(const IAST & create_function_query, const ContextPtr & context)
 {
     auto ptr = create_function_query.clone();
     auto & res = typeid_cast<ASTCreateFunctionQuery &>(*ptr);
     res.if_not_exists = false;
     res.or_replace = false;
     FunctionNameNormalizer::visit(res.function_core.get());
+    NormalizeSelectWithUnionQueryVisitor::Data data{context->getSettingsRef().union_default_mode};
+    NormalizeSelectWithUnionQueryVisitor{data}.visit(res.function_core);
     return ptr;
 }
 
 }
 
+UserDefinedSQLObjectsStorageBase::UserDefinedSQLObjectsStorageBase(ContextPtr global_context_)
+    : global_context(std::move(global_context_))
+{}
+
 ASTPtr UserDefinedSQLObjectsStorageBase::get(const String & object_name) const
 {
     std::lock_guard lock(mutex);
@@ -148,7 +157,7 @@ void UserDefinedSQLObjectsStorageBase::setAllObjects(const std::vector<std::pair
 {
     std::unordered_map<String, ASTPtr> normalized_functions;
     for (const auto & [function_name, create_query] : new_objects)
-        normalized_functions[function_name] = normalizeCreateFunctionQuery(*create_query);
+        normalized_functions[function_name] = normalizeCreateFunctionQuery(*create_query, global_context);
 
     std::lock_guard lock(mutex);
     object_name_to_create_object_map = std::move(normalized_functions);
@@ -166,7 +175,7 @@ std::vector<std::pair<String, ASTPtr>> UserDefinedSQLObjectsStorageBase::getAllO
 void UserDefinedSQLObjectsStorageBase::setObject(const String & object_name, const IAST & create_object_query)
 {
     std::lock_guard lock(mutex);
-    object_name_to_create_object_map[object_name] = normalizeCreateFunctionQuery(create_object_query);
+    object_name_to_create_object_map[object_name] = normalizeCreateFunctionQuery(create_object_query, global_context);
 }
 
 void UserDefinedSQLObjectsStorageBase::removeObject(const String & object_name)
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.h b/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.h
index cab63a3bfcf..0dbc5586f08 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.h
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.h
@@ -4,6 +4,7 @@
 #include <mutex>
 
 #include <Functions/UserDefined/IUserDefinedSQLObjectsStorage.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <Parsers/IAST.h>
 
@@ -13,6 +14,7 @@ namespace DB
 class UserDefinedSQLObjectsStorageBase : public IUserDefinedSQLObjectsStorage
 {
 public:
+    explicit UserDefinedSQLObjectsStorageBase(ContextPtr global_context_);
     ASTPtr get(const String & object_name) const override;
 
     ASTPtr tryGet(const String & object_name) const override;
@@ -64,6 +66,8 @@ protected:
 
     std::unordered_map<String, ASTPtr> object_name_to_create_object_map;
     mutable std::recursive_mutex mutex;
+
+    ContextPtr global_context;
 };
 
 }
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
index 01e7e3995fa..12c1302a3fe 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
@@ -48,7 +48,7 @@ namespace
 
 UserDefinedSQLObjectsZooKeeperStorage::UserDefinedSQLObjectsZooKeeperStorage(
     const ContextPtr & global_context_, const String & zookeeper_path_)
-    : global_context{global_context_}
+    : UserDefinedSQLObjectsStorageBase(global_context_)
     , zookeeper_getter{[global_context_]() { return global_context_->getZooKeeper(); }}
     , zookeeper_path{zookeeper_path_}
     , watch_queue{std::make_shared<ConcurrentBoundedQueue<std::pair<UserDefinedSQLObjectType, String>>>(std::numeric_limits<size_t>::max())}
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h
index 61002be2bfd..0aa9b198398 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h
@@ -68,8 +68,6 @@ private:
     void refreshObjects(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type);
     void syncObjects(const zkutil::ZooKeeperPtr & zookeeper, UserDefinedSQLObjectType object_type);
 
-    ContextPtr global_context;
-
     zkutil::ZooKeeperCachingGetter zookeeper_getter;
     String zookeeper_path;
     std::atomic<bool> objects_loaded = false;
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index 48262870553..4cbc6404b9b 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,7 +15,8 @@ namespace ErrorCodes
     extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
-/// Reasonable threshold.
+/// Reasonable thresholds.
+static constexpr Int64 max_array_size_in_columns_bytes = 1000000000;
 static constexpr size_t max_arrays_size_in_columns = 1000000000;
 
 
@@ -63,12 +64,19 @@ 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 {}", getName());
+                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());
 
             offset += array_size;
 
             if (unlikely(offset > max_arrays_size_in_columns))
-                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size while executing function {}", getName());
+                throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size {} (will generate at least {} elements) while executing function {}", array_size, offset, getName());
 
             offsets.push_back(offset);
         }
diff --git a/src/Functions/bitSlice.cpp b/src/Functions/bitSlice.cpp
index e2b455846d8..f24473351ae 100644
--- a/src/Functions/bitSlice.cpp
+++ b/src/Functions/bitSlice.cpp
@@ -18,9 +18,7 @@ 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
@@ -40,28 +38,22 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        const size_t number_of_arguments = arguments.size();
+        FunctionArgumentDescriptors mandatory_args{
+            {"s", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String"},
+            {"offset", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeNumber), nullptr, "(U)Int8, (U)Int16, (U)Int32, (U)Int64 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);
+        FunctionArgumentDescriptors optional_args{
+            {"length", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeNumber), nullptr, "(U)Int8, (U)Int16, (U)Int32, (U)Int64 or Float"},
+        };
 
-        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];
+        validateFunctionArguments(*this, arguments, mandatory_args, optional_args);
 
-        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());
+        const auto & type = arguments[0].type;
+        if (type->onlyNull())
+            return type;
 
         return std::make_shared<DataTypeString>();
     }
diff --git a/src/Functions/extract.cpp b/src/Functions/extract.cpp
index 6bbdaff0e3f..c78ee9898b7 100644
--- a/src/Functions/extract.cpp
+++ b/src/Functions/extract.cpp
@@ -16,10 +16,11 @@ struct ExtractImpl
         const ColumnString::Offsets & offsets,
         const std::string & pattern,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets)
+        ColumnString::Offsets & res_offsets,
+        size_t input_rows_count)
     {
         res_data.reserve(data.size() / 5);
-        res_offsets.resize(offsets.size());
+        res_offsets.resize(input_rows_count);
 
         const OptimizedRegularExpression regexp = Regexps::createRegexp<false, false, false>(pattern);
 
@@ -29,7 +30,7 @@ struct ExtractImpl
         size_t prev_offset = 0;
         size_t res_offset = 0;
 
-        for (size_t i = 0; i < offsets.size(); ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             size_t cur_offset = offsets[i];
 
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 07dbee27a9d..8829b3c4ff1 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -1233,6 +1233,12 @@ 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/jsonMergePatch.cpp b/src/Functions/jsonMergePatch.cpp
index a83daacdbf6..3bde415aabf 100644
--- a/src/Functions/jsonMergePatch.cpp
+++ b/src/Functions/jsonMergePatch.cpp
@@ -10,12 +10,14 @@
 
 #if USE_RAPIDJSON
 
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/filereadstream.h"
+/// Prevent stack overflow:
+#define RAPIDJSON_PARSE_DEFAULT_FLAGS (kParseIterativeFlag)
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/filereadstream.h>
+#include <rapidjson/error/en.h>
 
 
 namespace DB
@@ -31,17 +33,17 @@ namespace ErrorCodes
 
 namespace
 {
-    // select jsonMergePatch('{"a":1}','{"name": "joey"}','{"name": "tom"}','{"name": "zoey"}');
+    // select JSONMergePatch('{"a":1}','{"name": "joey"}','{"name": "tom"}','{"name": "zoey"}');
     //           ||
     //           \/
     // ┌───────────────────────┐
     // │ {"a":1,"name":"zoey"} │
     // └───────────────────────┘
-    class FunctionjsonMergePatch : public IFunction
+    class FunctionJSONMergePatch : public IFunction
     {
     public:
-        static constexpr auto name = "jsonMergePatch";
-        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionjsonMergePatch>(); }
+        static constexpr auto name = "JSONMergePatch";
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionJSONMergePatch>(); }
 
         String getName() const override { return name; }
         bool isVariadic() const override { return true; }
@@ -98,7 +100,11 @@ namespace
                 const char * json = str_ref.data;
 
                 document.Parse(json);
-                if (document.HasParseError() || !document.IsObject())
+
+                if (document.HasParseError())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Wrong JSON string to merge: {}", rapidjson::GetParseError_En(document.GetParseError()));
+
+                if (!document.IsObject())
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Wrong JSON string to merge. Expected JSON object");
             };
 
@@ -162,10 +168,12 @@ namespace
 
 }
 
-REGISTER_FUNCTION(jsonMergePatch)
+REGISTER_FUNCTION(JSONMergePatch)
 {
-    factory.registerFunction<FunctionjsonMergePatch>(FunctionDocumentation{
+    factory.registerFunction<FunctionJSONMergePatch>(FunctionDocumentation{
         .description="Returns the merged JSON object string, which is formed by merging multiple JSON objects."});
+
+    factory.registerAlias("jsonMergePatch", "JSONMergePatch");
 }
 
 }
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 0d42ce2abe1..534f7c0d8cd 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -1,14 +1,17 @@
-#include <Functions/IFunction.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsCommon.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.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 <Functions/IFunction.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/castColumn.h>
 #include <Common/HashTable/HashSet.h>
 #include <Core/Settings.h>
 
@@ -21,6 +24,7 @@ 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
@@ -155,7 +159,7 @@ private:
     bool use_variant_as_common_type = false;
 };
 
-/// mapFromArrays(keys, values) is a function that allows you to make key-value pair from a pair of arrays
+/// mapFromArrays(keys, values) is a function that allows you to make key-value pair from a pair of arrays or maps
 class FunctionMapFromArrays : public IFunction
 {
 public:
@@ -179,21 +183,28 @@ public:
                 getName(),
                 arguments.size());
 
-        /// The first argument should always be Array.
-        /// Because key type can not be nested type of Map, which is Tuple
-        DataTypePtr key_type;
-        if (const auto * keys_type = checkAndGetDataType<DataTypeArray>(arguments[0].get()))
-            key_type = keys_type->getNestedType();
-        else
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be an Array", getName());
+        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());
 
-        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());
+            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);
 
         DataTypes key_value_types{key_type, value_type};
         return std::make_shared<DataTypeMap>(key_value_types);
@@ -202,44 +213,59 @@ public:
     ColumnPtr executeImpl(
         const ColumnsWithTypeAndName & arguments, const DataTypePtr & /* result_type */, size_t /* input_rows_count */) const override
     {
-        bool is_keys_const = isColumnConst(*arguments[0].column);
-        ColumnPtr holder_keys;
-        const ColumnArray * col_keys;
-        if (is_keys_const)
+        auto get_array_column = [&](const ColumnPtr & column) -> std::pair<const ColumnArray *, ColumnPtr>
         {
-            holder_keys = arguments[0].column->convertToFullColumnIfConst();
-            col_keys = checkAndGetColumn<ColumnArray>(holder_keys.get());
-        }
-        else
+            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))
         {
-            col_keys = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
+            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());
         }
 
-        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());
+            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH, "Two arguments of function {} must have equal sizes", getName());
 
-        const auto & data_keys = col_keys->getDataPtr();
         const auto & data_values = col_values->getDataPtr();
         const auto & offsets = col_keys->getOffsetsPtr();
-        auto nested_column = ColumnArray::create(ColumnTuple::create(Columns{data_keys, data_values}), offsets);
+        auto nested_column = ColumnArray::create(ColumnTuple::create(Columns{std::move(data_keys), data_values}), offsets);
         return ColumnMap::create(nested_column);
     }
 };
@@ -250,10 +276,7 @@ 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; }
 
@@ -262,9 +285,11 @@ 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());
@@ -380,7 +405,6 @@ public:
         return ColumnMap::create(nested_column);
     }
 };
-
 }
 
 REGISTER_FUNCTION(Map)
diff --git a/src/Functions/printf.cpp b/src/Functions/printf.cpp
new file mode 100644
index 00000000000..3cf3efaf534
--- /dev/null
+++ b/src/Functions/printf.cpp
@@ -0,0 +1,364 @@
+#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/IO/Archives/ArchiveUtils.cpp b/src/IO/Archives/ArchiveUtils.cpp
new file mode 100644
index 00000000000..50009087de3
--- /dev/null
+++ b/src/IO/Archives/ArchiveUtils.cpp
@@ -0,0 +1,50 @@
+#include <IO/Archives/ArchiveUtils.h>
+
+#include <string_view>
+#include <array>
+
+namespace DB
+{
+
+namespace
+{
+
+using namespace std::literals;
+constexpr std::array tar_extensions{".tar"sv, ".tar.gz"sv, ".tgz"sv, ".tar.zst"sv, ".tzst"sv, ".tar.xz"sv, ".tar.bz2"sv, ".tar.lzma"sv};
+constexpr std::array zip_extensions{".zip"sv, ".zipx"sv};
+constexpr std::array sevenz_extensiosns{".7z"sv};
+
+bool hasSupportedExtension(std::string_view path, const auto & supported_extensions)
+{
+    for (auto supported_extension : supported_extensions)
+    {
+        if (path.ends_with(supported_extension))
+            return true;
+    }
+
+    return false;
+}
+
+}
+
+bool hasSupportedTarExtension(std::string_view path)
+{
+    return hasSupportedExtension(path, tar_extensions);
+}
+
+bool hasSupportedZipExtension(std::string_view path)
+{
+    return hasSupportedExtension(path, zip_extensions);
+}
+
+bool hasSupported7zExtension(std::string_view path)
+{
+    return hasSupportedExtension(path, sevenz_extensiosns);
+}
+
+bool hasSupportedArchiveExtension(std::string_view path)
+{
+    return hasSupportedTarExtension(path) || hasSupportedZipExtension(path) || hasSupported7zExtension(path);
+}
+
+}
diff --git a/src/IO/Archives/ArchiveUtils.h b/src/IO/Archives/ArchiveUtils.h
index 1b66be005a2..cdb731d1d57 100644
--- a/src/IO/Archives/ArchiveUtils.h
+++ b/src/IO/Archives/ArchiveUtils.h
@@ -10,3 +10,17 @@
 #include <archive.h>
 #include <archive_entry.h>
 #endif
+
+#include <string_view>
+
+namespace DB
+{
+
+bool hasSupportedTarExtension(std::string_view path);
+bool hasSupportedZipExtension(std::string_view path);
+bool hasSupported7zExtension(std::string_view path);
+
+bool hasSupportedArchiveExtension(std::string_view path);
+
+
+}
diff --git a/src/IO/Archives/createArchiveReader.cpp b/src/IO/Archives/createArchiveReader.cpp
index 782602091ac..dfa098eede0 100644
--- a/src/IO/Archives/createArchiveReader.cpp
+++ b/src/IO/Archives/createArchiveReader.cpp
@@ -1,6 +1,7 @@
 #include <IO/Archives/LibArchiveReader.h>
 #include <IO/Archives/ZipArchiveReader.h>
 #include <IO/Archives/createArchiveReader.h>
+#include <IO/Archives/ArchiveUtils.h>
 #include <Common/Exception.h>
 
 
@@ -12,7 +13,6 @@ extern const int CANNOT_UNPACK_ARCHIVE;
 extern const int SUPPORT_IS_DISABLED;
 }
 
-
 std::shared_ptr<IArchiveReader> createArchiveReader(const String & path_to_archive)
 {
     return createArchiveReader(path_to_archive, {}, 0);
@@ -24,11 +24,7 @@ std::shared_ptr<IArchiveReader> createArchiveReader(
     [[maybe_unused]] const std::function<std::unique_ptr<SeekableReadBuffer>()> & archive_read_function,
     [[maybe_unused]] size_t archive_size)
 {
-    using namespace std::literals;
-    static constexpr std::array tar_extensions{
-        ".tar"sv, ".tar.gz"sv, ".tgz"sv, ".tar.zst"sv, ".tzst"sv, ".tar.xz"sv, ".tar.bz2"sv, ".tar.lzma"sv};
-
-    if (path_to_archive.ends_with(".zip") || path_to_archive.ends_with(".zipx"))
+    if (hasSupportedZipExtension(path_to_archive))
     {
 #if USE_MINIZIP
         return std::make_shared<ZipArchiveReader>(path_to_archive, archive_read_function, archive_size);
@@ -36,8 +32,7 @@ std::shared_ptr<IArchiveReader> createArchiveReader(
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "minizip library is disabled");
 #endif
     }
-    else if (std::any_of(
-                 tar_extensions.begin(), tar_extensions.end(), [&](const auto extension) { return path_to_archive.ends_with(extension); }))
+    else if (hasSupportedTarExtension(path_to_archive))
     {
 #if USE_LIBARCHIVE
         return std::make_shared<TarArchiveReader>(path_to_archive, archive_read_function);
@@ -45,7 +40,7 @@ std::shared_ptr<IArchiveReader> createArchiveReader(
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "libarchive library is disabled");
 #endif
     }
-    else if (path_to_archive.ends_with(".7z"))
+    else if (hasSupported7zExtension(path_to_archive))
     {
 #if USE_LIBARCHIVE
         return std::make_shared<SevenZipArchiveReader>(path_to_archive);
diff --git a/src/IO/Archives/createArchiveWriter.cpp b/src/IO/Archives/createArchiveWriter.cpp
index 9a169587088..53be0a85a10 100644
--- a/src/IO/Archives/createArchiveWriter.cpp
+++ b/src/IO/Archives/createArchiveWriter.cpp
@@ -1,3 +1,4 @@
+#include <IO/Archives/ArchiveUtils.h>
 #include <IO/Archives/LibArchiveWriter.h>
 #include <IO/Archives/TarArchiveWriter.h>
 #include <IO/Archives/ZipArchiveWriter.h>
@@ -24,10 +25,7 @@ std::shared_ptr<IArchiveWriter> createArchiveWriter(const String & path_to_archi
 std::shared_ptr<IArchiveWriter>
 createArchiveWriter(const String & path_to_archive, [[maybe_unused]] std::unique_ptr<WriteBuffer> archive_write_buffer)
 {
-    using namespace std::literals;
-    static constexpr std::array tar_extensions{
-        ".tar"sv, ".tar.gz"sv, ".tgz"sv, ".tar.bz2"sv, ".tar.lzma"sv, ".tar.zst"sv, ".tzst"sv, ".tar.xz"sv};
-    if (path_to_archive.ends_with(".zip") || path_to_archive.ends_with(".zipx"))
+    if (hasSupportedZipExtension(path_to_archive))
     {
 #if USE_MINIZIP
         return std::make_shared<ZipArchiveWriter>(path_to_archive, std::move(archive_write_buffer));
@@ -35,8 +33,7 @@ createArchiveWriter(const String & path_to_archive, [[maybe_unused]] std::unique
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "minizip library is disabled");
 #endif
     }
-    else if (std::any_of(
-                 tar_extensions.begin(), tar_extensions.end(), [&](const auto extension) { return path_to_archive.ends_with(extension); }))
+    else if (hasSupportedTarExtension(path_to_archive))
     {
 #if USE_LIBARCHIVE
         return std::make_shared<TarArchiveWriter>(path_to_archive, std::move(archive_write_buffer));
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index c771fced73a..9559462e62b 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -3,13 +3,13 @@
 #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>
 
@@ -39,6 +39,7 @@ 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>
@@ -1494,10 +1495,20 @@ template bool readDateTimeTextFallback<bool, true>(time_t &, ReadBuffer &, const
 
 
 template <typename ReturnType>
-ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
+ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings, size_t current_depth)
 {
     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)
@@ -1560,8 +1571,8 @@ ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const Fo
         while (true)
         {
             if constexpr (throw_exception)
-                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings);
-            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings))
+                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1);
+            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1))
                 return ReturnType(false);
 
             skipWhitespaceIfAny(buf);
@@ -1619,8 +1630,8 @@ ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const Fo
             skipWhitespaceIfAny(buf);
 
             if constexpr (throw_exception)
-                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings);
-            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings))
+                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1);
+            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings, current_depth + 1))
                 return ReturnType(false);
 
             skipWhitespaceIfAny(buf);
@@ -1659,12 +1670,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);
+    skipJSONFieldImpl<void>(buf, name_of_field, settings, 0);
 }
 
 bool trySkipJSONField(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
 {
-    return skipJSONFieldImpl<bool>(buf, name_of_field, settings);
+    return skipJSONFieldImpl<bool>(buf, name_of_field, settings, 0);
 }
 
 
diff --git a/src/IO/S3/Client.cpp b/src/IO/S3/Client.cpp
index 6e659c82def..a966e370ca1 100644
--- a/src/IO/S3/Client.cpp
+++ b/src/IO/S3/Client.cpp
@@ -24,6 +24,7 @@
 
 #include <Common/assert_cast.h>
 #include <Common/logger_useful.h>
+#include <Common/CurrentMetrics.h>
 #include <Common/ProxyConfigurationResolverProvider.h>
 
 #include <Core/Settings.h>
@@ -43,6 +44,11 @@ namespace ProfileEvents
     extern const Event TinyS3Clients;
 }
 
+namespace CurrentMetrics
+{
+    extern const Metric S3DiskNoKeyErrors;
+}
+
 namespace DB
 {
 
@@ -381,7 +387,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 enrichErrorMessage(
+    return processRequestResult(
         HeadObject(static_cast<const Model::HeadObjectRequest&>(request)));
 }
 
@@ -402,7 +408,7 @@ Model::ListObjectsOutcome Client::ListObjects(ListObjectsRequest & request) cons
 
 Model::GetObjectOutcome Client::GetObject(GetObjectRequest & request) const
 {
-    return enrichErrorMessage(
+    return processRequestResult(
         doRequest(request, [this](const Model::GetObjectRequest & req) { return GetObject(req); }));
 }
 
@@ -689,11 +695,14 @@ Client::doRequestWithRetryNetworkErrors(RequestType & request, RequestFn request
 }
 
 template <typename RequestResult>
-RequestResult Client::enrichErrorMessage(RequestResult && outcome) const
+RequestResult Client::processRequestResult(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::S3DiskNoKeyErrors);
+
     String enriched_message = fmt::format(
         "{} {}",
         outcome.GetError().GetMessage(),
diff --git a/src/IO/S3/Client.h b/src/IO/S3/Client.h
index de554e75d67..36b793876d6 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 enrichErrorMessage(RequestResult && outcome) const;
+    RequestResult processRequestResult(RequestResult && outcome) const;
 
     String initial_endpoint;
     std::shared_ptr<Aws::Auth::AWSCredentialsProvider> credentials_provider;
diff --git a/src/IO/S3/URI.cpp b/src/IO/S3/URI.cpp
index 4bf7a3ddf86..fead18315d8 100644
--- a/src/IO/S3/URI.cpp
+++ b/src/IO/S3/URI.cpp
@@ -6,6 +6,7 @@
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
 #include <Common/re2.h>
+#include <IO/Archives/ArchiveUtils.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 
@@ -29,7 +30,7 @@ namespace ErrorCodes
 namespace S3
 {
 
-URI::URI(const std::string & uri_)
+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)
@@ -54,10 +55,11 @@ URI::URI(const std::string & uri_)
     static constexpr auto OSS = "OSS";
     static constexpr auto EOS = "EOS";
 
-    if (containsArchive(uri_))
-        std::tie(uri_str, archive_pattern) = getPathToArchiveAndArchivePattern(uri_);
+    if (allow_archive_path_syntax)
+        std::tie(uri_str, archive_pattern) = getURIAndArchivePattern(uri_);
     else
         uri_str = uri_;
+
     uri = Poco::URI(uri_str);
 
     std::unordered_map<std::string, std::string> mapper;
@@ -167,32 +169,37 @@ void URI::validateBucket(const String & bucket, const Poco::URI & uri)
             !uri.empty() ? " (" + uri.toString() + ")" : "");
 }
 
-bool URI::containsArchive(const std::string & source)
+std::pair<std::string, std::optional<std::string>> URI::getURIAndArchivePattern(const std::string & source)
 {
     size_t pos = source.find("::");
-    return (pos != std::string::npos);
-}
+    if (pos == String::npos)
+        return {source, std::nullopt};
 
-std::pair<std::string, std::string> URI::getPathToArchiveAndArchivePattern(const std::string & source)
-{
-    size_t pos = source.find("::");
-    assert(pos != std::string::npos);
+    std::string_view path_to_archive_view = std::string_view{source}.substr(0, pos);
+    bool contains_spaces_around_operator = false;
+    while (path_to_archive_view.ends_with(' '))
+    {
+        contains_spaces_around_operator = true;
+        path_to_archive_view.remove_suffix(1);
+    }
 
-    std::string path_to_archive = source.substr(0, pos);
-    while ((!path_to_archive.empty()) && path_to_archive.ends_with(' '))
-        path_to_archive.pop_back();
+    std::string_view archive_pattern_view = std::string_view{source}.substr(pos + 2);
+    while (archive_pattern_view.starts_with(' '))
+    {
+        contains_spaces_around_operator = true;
+        archive_pattern_view.remove_prefix(1);
+    }
 
-    if (path_to_archive.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path to archive is empty");
+    /// possible situations when the first part can be archive is only if one of the following is true:
+    /// - it contains supported extension
+    /// - it contains spaces after or before :: (URI cannot contain spaces)
+    /// - it contains characters that could mean glob expression
+    if (archive_pattern_view.empty() || path_to_archive_view.empty()
+        || (!contains_spaces_around_operator && !hasSupportedArchiveExtension(path_to_archive_view)
+            && path_to_archive_view.find_first_of("*?{") == std::string_view::npos))
+        return {source, std::nullopt};
 
-    std::string_view path_in_archive_view = std::string_view{source}.substr(pos + 2);
-    while (path_in_archive_view.front() == ' ')
-        path_in_archive_view.remove_prefix(1);
-
-    if (path_in_archive_view.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Filename is empty");
-
-    return {path_to_archive, std::string{path_in_archive_view}};
+    return std::pair{std::string{path_to_archive_view}, std::string{archive_pattern_view}};
 }
 }
 
diff --git a/src/IO/S3/URI.h b/src/IO/S3/URI.h
index 363f98c46f5..80e2da96cd4 100644
--- a/src/IO/S3/URI.h
+++ b/src/IO/S3/URI.h
@@ -36,14 +36,13 @@ struct URI
     bool is_virtual_hosted_style;
 
     URI() = default;
-    explicit URI(const std::string & uri_);
+    explicit URI(const std::string & uri_, bool allow_archive_path_syntax = false);
     void addRegionToURI(const std::string & region);
 
     static void validateBucket(const std::string & bucket, const Poco::URI & uri);
 
 private:
-    bool containsArchive(const std::string & source);
-    std::pair<std::string, std::string> getPathToArchiveAndArchivePattern(const std::string & source);
+    std::pair<std::string, std::optional<std::string>> getURIAndArchivePattern(const std::string & source);
 };
 
 }
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 3682e49b018..e702b4d35ad 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -277,12 +277,10 @@ WriteBufferFromS3::~WriteBufferFromS3()
             "The file might not be written to S3. "
             "{}.",
             getVerboseLogDetails());
-        return;
     }
-
-    /// That destructor could be call with finalized=false in case of exceptions
-    if (!finalized && !canceled)
+    else if (!finalized)
     {
+        /// That destructor could be call with finalized=false in case of exceptions
         LOG_INFO(
             log,
             "WriteBufferFromS3 is not finalized in destructor. "
@@ -291,9 +289,10 @@ WriteBufferFromS3::~WriteBufferFromS3()
             getVerboseLogDetails());
     }
 
+    /// Wait for all tasks, because they contain reference to this write buffer.
     task_tracker->safeWaitAll();
 
-    if (!multipart_upload_id.empty() && !multipart_upload_finished)
+    if (!canceled && !multipart_upload_id.empty() && !multipart_upload_finished)
     {
         LOG_WARNING(log, "WriteBufferFromS3 was neither finished nor aborted, try to abort upload in destructor. {}.", getVerboseLogDetails());
         tryToAbortMultipartUpload();
diff --git a/src/Interpreters/Cache/FileCache.cpp b/src/Interpreters/Cache/FileCache.cpp
index a88c0de2cfe..13c70b38543 100644
--- a/src/Interpreters/Cache/FileCache.cpp
+++ b/src/Interpreters/Cache/FileCache.cpp
@@ -316,14 +316,39 @@ FileSegments FileCache::getImpl(const LockedKey & locked_key, const FileSegment:
     return result;
 }
 
-std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size)
+std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size, size_t aligned_size)
 {
-    assert(size > 0);
+    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.
+
     std::vector<FileSegment::Range> ranges;
 
     size_t current_pos = offset;
     size_t end_pos_non_included = offset + size;
-    size_t remaining_size = size;
+    size_t remaining_size = aligned_size;
 
     FileSegments file_segments;
     const size_t max_size = max_file_segment_size.load();
@@ -339,43 +364,30 @@ std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size
     return ranges;
 }
 
-FileSegments FileCache::splitRangeIntoFileSegments(
+FileSegments FileCache::createFileSegmentsFromRanges(
     LockedKey & locked_key,
-    size_t offset,
-    size_t size,
-    FileSegment::State state,
+    const std::vector<FileSegment::Range> & ranges,
+    size_t & file_segments_count,
     size_t file_segments_limit,
     const CreateFileSegmentSettings & create_settings)
 {
-    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))
+    FileSegments result;
+    for (const auto & r : ranges)
     {
-        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;
+        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;
     }
-
-    return file_segments;
+    return result;
 }
 
 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)
@@ -442,18 +454,9 @@ void FileCache::fillHolesWithEmptyFileSegments(
         }
         else
         {
-            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));
+            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));
         }
 
         if (is_limit_reached())
@@ -479,7 +482,7 @@ void FileCache::fillHolesWithEmptyFileSegments(
 
     chassert(!file_segments_limit || file_segments.size() < file_segments_limit);
 
-    if (current_pos <= range.right)
+    if (current_pos <= non_aligned_right_offset)
     {
         ///   ________]     -- requested range
         ///   _____]
@@ -487,28 +490,20 @@ 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, hole_size, FileSegment::State::DETACHED, create_settings);
+                locked_key.getKey(), current_pos, non_aligned_hole_size, FileSegment::State::DETACHED, create_settings);
 
             file_segments.insert(file_segments.end(), file_segment);
         }
         else
         {
-            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));
+            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));
 
             if (is_limit_reached())
                 erase_unprocessed();
@@ -541,8 +536,9 @@ FileSegmentsHolderPtr FileCache::set(
     }
     else
     {
-        file_segments = splitRangeIntoFileSegments(
-            *locked_key, offset, size, FileSegment::State::EMPTY, /* file_segments_limit */0, create_settings);
+        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);
     }
 
     return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
@@ -562,23 +558,27 @@ FileCache::getOrSet(
 
     assertInitialized();
 
-    FileSegment::Range range(offset, offset + size - 1);
+    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;
 
-    const auto aligned_offset = roundDownToMultiple(range.left, boundary_alignment);
-    auto aligned_end_offset = std::min(roundUpToMultiple(offset + size, boundary_alignment), file_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;
 
-    chassert(aligned_offset <= range.left);
-    chassert(aligned_end_offset >= range.right);
+    chassert(aligned_offset <= initial_range.left);
+    chassert(aligned_end_offset >= initial_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, range, file_segments_limit);
+    auto file_segments = getImpl(*locked_key, initial_range, file_segments_limit);
 
     if (file_segments_limit)
     {
         chassert(file_segments.size() <= file_segments_limit);
         if (file_segments.size() == file_segments_limit)
-            range.right = aligned_end_offset = file_segments.back()->range().right;
+            result_range.right = aligned_end_offset = file_segments.back()->range().right;
     }
 
     /// Check case if we have uncovered prefix, e.g.
@@ -590,11 +590,11 @@ FileCache::getOrSet(
     ///   [    ]
     ///   ^----^
     ///   uncovered prefix.
-    const bool has_uncovered_prefix = file_segments.empty() || range.left < file_segments.front()->range().left;
+    const bool has_uncovered_prefix = file_segments.empty() || result_range.left < file_segments.front()->range().left;
 
-    if (aligned_offset < range.left && has_uncovered_prefix)
+    if (aligned_offset < result_range.left && has_uncovered_prefix)
     {
-        auto prefix_range = FileSegment::Range(aligned_offset, file_segments.empty() ? range.left - 1 : file_segments.front()->range().left - 1);
+        auto prefix_range = FileSegment::Range(aligned_offset, file_segments.empty() ? result_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())
@@ -603,7 +603,7 @@ FileCache::getOrSet(
             ///   ^                     ^               ^
             ///   aligned_offset        range.left      range.right
             ///                             [___] [__________]         <-- current cache (example)
-            range.left = aligned_offset;
+            result_range.left = aligned_offset;
         }
         else
         {
@@ -614,10 +614,10 @@ FileCache::getOrSet(
             ///                  ^
             ///                  prefix_file_segments.back().right
 
-            chassert(prefix_file_segments.back()->range().right < range.left);
+            chassert(prefix_file_segments.back()->range().right < result_range.left);
             chassert(prefix_file_segments.back()->range().right >= aligned_offset);
 
-            range.left = prefix_file_segments.back()->range().right + 1;
+            result_range.left = prefix_file_segments.back()->range().right + 1;
         }
     }
 
@@ -630,11 +630,11 @@ FileCache::getOrSet(
     ///                   [___]
     ///                   ^---^
     ///                    uncovered_suffix
-    const bool has_uncovered_suffix = file_segments.empty() || file_segments.back()->range().right < range.right;
+    const bool has_uncovered_suffix = file_segments.empty() || file_segments.back()->range().right < result_range.right;
 
-    if (range.right < aligned_end_offset && has_uncovered_suffix)
+    if (result_range.right < aligned_end_offset && has_uncovered_suffix)
     {
-        auto suffix_range = FileSegment::Range(range.right, aligned_end_offset);
+        auto suffix_range = FileSegment::Range(result_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);
 
@@ -645,7 +645,7 @@ FileCache::getOrSet(
             ///   range.left         range.right              aligned_end_offset
             ///      [___]   [___]                                    <-- current cache (example)
 
-            range.right = aligned_end_offset;
+            result_range.right = aligned_end_offset;
         }
         else
         {
@@ -655,31 +655,33 @@ FileCache::getOrSet(
             ///      [___]   [___]          [_________]               <-- current cache (example)
             ///                             ^
             ///                             suffix_file_segments.front().left
-            range.right = suffix_file_segments.front()->range().left - 1;
+            result_range.right = suffix_file_segments.front()->range().left - 1;
         }
     }
 
     if (file_segments.empty())
     {
-        file_segments = splitRangeIntoFileSegments(*locked_key, range.left, range.size(), FileSegment::State::EMPTY, file_segments_limit, create_settings);
+        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));
     }
     else
     {
-        chassert(file_segments.front()->range().right >= range.left);
-        chassert(file_segments.back()->range().left <= range.right);
+        chassert(file_segments.front()->range().right >= result_range.left);
+        chassert(file_segments.back()->range().left <= result_range.right);
 
         fillHolesWithEmptyFileSegments(
-            *locked_key, file_segments, range, file_segments_limit, /* fill_with_detached */false, create_settings);
+            *locked_key, file_segments, result_range, offset + size - 1, file_segments_limit, /* fill_with_detached */false, create_settings);
 
-        if (!file_segments.front()->range().contains(offset))
+        if (!file_segments.front()->range().contains(result_range.left))
         {
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected {} to include {} "
                             "(end offset: {}, aligned offset: {}, aligned end offset: {})",
-                            file_segments.front()->range().toString(), offset, range.right, aligned_offset, aligned_end_offset);
+                            file_segments.front()->range().toString(), offset, result_range.right, aligned_offset, aligned_end_offset);
         }
     }
 
-    chassert(file_segments_limit ? file_segments.back()->range().left <= range.right : file_segments.back()->range().contains(range.right));
+    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.size() <= file_segments_limit);
 
     return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
@@ -713,7 +715,7 @@ FileSegmentsHolderPtr FileCache::get(
             }
 
             fillHolesWithEmptyFileSegments(
-                *locked_key, file_segments, range, file_segments_limit, /* fill_with_detached */true, CreateFileSegmentSettings{});
+                *locked_key, file_segments, range, offset + size - 1, 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));
@@ -998,18 +1000,19 @@ void FileCache::freeSpaceRatioKeepingThreadFunc()
     FileCacheReserveStat stat;
     EvictionCandidates eviction_candidates;
 
-    bool limits_satisfied = true;
+    IFileCachePriority::CollectStatus desired_size_status;
     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).
-        limits_satisfied = main_priority->collectCandidatesForEviction(
+        desired_size_status = 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 (limits_satisfied && eviction_candidates.size() < keep_up_free_space_remove_batch)
+        if (desired_size_status == IFileCachePriority::CollectStatus::SUCCESS
+            && 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);
@@ -1063,13 +1066,24 @@ void FileCache::freeSpaceRatioKeepingThreadFunc()
     watch.stop();
     ProfileEvents::increment(ProfileEvents::FilesystemCacheFreeSpaceKeepingThreadWorkMilliseconds, watch.elapsedMilliseconds());
 
-    LOG_TRACE(log, "Free space ratio keeping thread finished in {} ms", watch.elapsedMilliseconds());
+    LOG_TRACE(log, "Free space ratio keeping thread finished in {} ms (status: {})",
+              watch.elapsedMilliseconds(), desired_size_status);
 
     [[maybe_unused]] bool scheduled = false;
-    if (limits_satisfied)
-        scheduled = keep_up_free_space_ratio_task->scheduleAfter(general_reschedule_ms);
-    else
-        scheduled = keep_up_free_space_ratio_task->schedule();
+    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;
+        }
+    }
     chassert(scheduled);
 }
 
@@ -1546,7 +1560,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))
+                    stat, eviction_candidates, cache_lock) == IFileCachePriority::CollectStatus::SUCCESS)
             {
                 if (eviction_candidates.size() == 0)
                 {
diff --git a/src/Interpreters/Cache/FileCache.h b/src/Interpreters/Cache/FileCache.h
index 527fd9d5edf..07be802a940 100644
--- a/src/Interpreters/Cache/FileCache.h
+++ b/src/Interpreters/Cache/FileCache.h
@@ -263,17 +263,12 @@ 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);
+    std::vector<FileSegment::Range> splitRange(size_t offset, size_t size, size_t aligned_size);
 
-    /// 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(
+    FileSegments createFileSegmentsFromRanges(
         LockedKey & locked_key,
-        size_t offset,
-        size_t size,
-        FileSegment::State state,
+        const std::vector<FileSegment::Range> & ranges,
+        size_t & file_segments_count,
         size_t file_segments_limit,
         const CreateFileSegmentSettings & create_settings);
 
@@ -281,6 +276,7 @@ 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/FileSegment.cpp b/src/Interpreters/Cache/FileSegment.cpp
index 1664a91b694..c46fb978ae4 100644
--- a/src/Interpreters/Cache/FileSegment.cpp
+++ b/src/Interpreters/Cache/FileSegment.cpp
@@ -1008,7 +1008,12 @@ FileSegment & FileSegmentsHolder::add(FileSegmentPtr && file_segment)
     return *file_segments.back();
 }
 
-String FileSegmentsHolder::toString()
+String FileSegmentsHolder::toString(bool with_state)
+{
+    return DB::toString(file_segments, with_state);
+}
+
+String toString(const FileSegments & file_segments, bool with_state)
 {
     String ranges;
     for (const auto & file_segment : file_segments)
@@ -1018,6 +1023,8 @@ String FileSegmentsHolder::toString()
         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 d6b37b60dc1..25ffb880b45 100644
--- a/src/Interpreters/Cache/FileSegment.h
+++ b/src/Interpreters/Cache/FileSegment.h
@@ -291,7 +291,7 @@ struct FileSegmentsHolder : private boost::noncopyable
 
     size_t size() const { return file_segments.size(); }
 
-    String toString();
+    String toString(bool with_state = false);
 
     void popFront() { completeAndPopFrontImpl(); }
 
@@ -317,4 +317,6 @@ 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 5d8eb9dd54a..6970d02473a 100644
--- a/src/Interpreters/Cache/IFileCachePriority.h
+++ b/src/Interpreters/Cache/IFileCachePriority.h
@@ -150,8 +150,14 @@ 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 `true` if the first condition is satisfied.
-    virtual bool collectCandidatesForEviction(
+    /// Return SUCCESS status if the first condition is satisfied.
+    enum class CollectStatus
+    {
+        SUCCESS,
+        CANNOT_EVICT,
+        REACHED_MAX_CANDIDATES_LIMIT,
+    };
+    virtual CollectStatus 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 ec96eb14a8a..0e0170c76e3 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/LRUFileCachePriority.cpp
@@ -323,7 +323,7 @@ bool LRUFileCachePriority::collectCandidatesForEviction(
     }
 }
 
-bool LRUFileCachePriority::collectCandidatesForEviction(
+IFileCachePriority::CollectStatus LRUFileCachePriority::collectCandidatesForEviction(
     size_t desired_size,
     size_t desired_elements_count,
     size_t max_candidates_to_evict,
@@ -336,12 +336,24 @@ bool LRUFileCachePriority::collectCandidatesForEviction(
         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 = [&]()
     {
-        return desired_limits_satisfied() || (max_candidates_to_evict && res.size() >= max_candidates_to_evict);
+        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;
     };
     iterateForEviction(res, stat, stop_condition, lock);
-    return desired_limits_satisfied();
+    chassert(status != CollectStatus::SUCCESS || stop_condition());
+    return status;
 }
 
 void LRUFileCachePriority::iterateForEviction(
@@ -350,6 +362,9 @@ 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 e0691cade43..0ca62b19d37 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;
 
-    bool collectCandidatesForEviction(
+    CollectStatus collectCandidatesForEviction(
         size_t desired_size,
         size_t desired_elements_count,
         size_t max_candidates_to_evict,
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.cpp b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
index 7a3fdf5160e..f5ea519d7d4 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
@@ -256,7 +256,7 @@ bool SLRUFileCachePriority::collectCandidatesForEvictionInProtected(
     return true;
 }
 
-bool SLRUFileCachePriority::collectCandidatesForEviction(
+IFileCachePriority::CollectStatus SLRUFileCachePriority::collectCandidatesForEviction(
     size_t desired_size,
     size_t desired_elements_count,
     size_t max_candidates_to_evict,
@@ -268,7 +268,7 @@ bool SLRUFileCachePriority::collectCandidatesForEviction(
     const auto desired_probationary_elements_num = getRatio(desired_elements_count, 1 - size_ratio);
 
     FileCacheReserveStat probationary_stat;
-    const bool probationary_limit_satisfied = probationary_queue.collectCandidatesForEviction(
+    const auto probationary_desired_size_status = probationary_queue.collectCandidatesForEviction(
         desired_probationary_size, desired_probationary_elements_num,
         max_candidates_to_evict, probationary_stat, res, lock);
 
@@ -285,14 +285,14 @@ bool SLRUFileCachePriority::collectCandidatesForEviction(
     chassert(!max_candidates_to_evict || res.size() <= max_candidates_to_evict);
     chassert(res.size() == stat.total_stat.releasable_count);
 
-    if (max_candidates_to_evict && res.size() >= max_candidates_to_evict)
-        return probationary_limit_satisfied;
+    if (probationary_desired_size_status == CollectStatus::REACHED_MAX_CANDIDATES_LIMIT)
+        return probationary_desired_size_status;
 
     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 bool protected_limit_satisfied = protected_queue.collectCandidatesForEviction(
+    const auto protected_desired_size_status = protected_queue.collectCandidatesForEviction(
         desired_protected_size, desired_protected_elements_num,
         max_candidates_to_evict - res.size(), protected_stat, res, lock);
 
@@ -306,7 +306,10 @@ bool SLRUFileCachePriority::collectCandidatesForEviction(
              desired_protected_size, desired_protected_elements_num,
              protected_queue.getStateInfoForLog(lock));
 
-    return probationary_limit_satisfied && protected_limit_satisfied;
+    if (probationary_desired_size_status == CollectStatus::SUCCESS)
+        return protected_desired_size_status;
+    else
+        return probationary_desired_size_status;
 }
 
 void SLRUFileCachePriority::downgrade(IteratorPtr iterator, const CachePriorityGuard::Lock & lock)
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.h b/src/Interpreters/Cache/SLRUFileCachePriority.h
index 2102a0ec558..23bc8c0908b 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;
 
-    bool collectCandidatesForEviction(
+    CollectStatus collectCandidatesForEviction(
         size_t desired_size,
         size_t desired_elements_count,
         size_t max_candidates_to_evict,
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 96405f35f3f..511300be2e0 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -922,7 +922,16 @@ private:
         if (enable_async_loading)
         {
             /// Put a job to the thread pool for the loading.
-            auto thread = ThreadFromGlobalPool{&LoadingDispatcher::doLoading, this, info.name, loading_id, forced_to_reload, min_id_to_finish_loading_dependencies_, true, CurrentThread::getGroup()};
+            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;
+            }
             loading_threads.try_emplace(loading_id, std::move(thread));
         }
         else
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
index b2f55003da5..b642b5def91 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
@@ -4,8 +4,6 @@
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/IAST_fwd.h>
 
-#include <unordered_set>
-
 namespace DB
 {
 
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 271e23a7288..6cb50b310ad 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -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->getSettingsRef());
+            res.query_settings = std::make_shared<Settings>(ctx->getSettingsCopy());
             res.current_database = ctx->getCurrentDatabase();
         }
     }
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index ba6fc0f14a0..ce58f7f922c 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -796,10 +796,9 @@ 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.",
-                        formatted1);
+                        "Inconsistent AST formatting: the query:\n{}\ncannot parse query back from {}",
+                        formatted1, std::string_view(begin, end-begin));
                 else
                     throw;
             }
diff --git a/src/Parsers/ASTColumnsTransformers.cpp b/src/Parsers/ASTColumnsTransformers.cpp
index 2a61892f8cc..332ebca3bdb 100644
--- a/src/Parsers/ASTColumnsTransformers.cpp
+++ b/src/Parsers/ASTColumnsTransformers.cpp
@@ -323,9 +323,7 @@ void ASTColumnsReplaceTransformer::formatImpl(const FormatSettings & settings, F
 {
     settings.ostr << (settings.hilite ? hilite_keyword : "") << "REPLACE" << (is_strict ? " STRICT " : " ") << (settings.hilite ? hilite_none : "");
 
-    if (children.size() > 1)
-        settings.ostr << "(";
-
+    settings.ostr << "(";
     for (ASTs::const_iterator it = children.begin(); it != children.end(); ++it)
     {
         if (it != children.begin())
@@ -333,9 +331,7 @@ void ASTColumnsReplaceTransformer::formatImpl(const FormatSettings & settings, F
 
         (*it)->formatImpl(settings, state, frame);
     }
-
-    if (children.size() > 1)
-        settings.ostr << ")";
+    settings.ostr << ")";
 }
 
 void ASTColumnsReplaceTransformer::appendColumnName(WriteBuffer & ostr) const
diff --git a/src/Planner/CollectTableExpressionData.cpp b/src/Planner/CollectTableExpressionData.cpp
index 2fe62aa9be0..c48813a4ed4 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)
+        if (column_source_node_type == QueryTreeNodeType::LAMBDA || column_source_node_type == QueryTreeNodeType::INTERPOLATE)
             return;
 
         /// JOIN using expression
diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index 968642dc9de..b837d9428a1 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -744,6 +744,8 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
         }
         else
         {
+            ActionsDAG rename_dag;
+
             for (auto & interpolate_node : interpolate_list_nodes)
             {
                 auto & interpolate_node_typed = interpolate_node->as<InterpolateNode &>();
@@ -772,8 +774,28 @@ void addWithFillStepIfNeeded(QueryPlan & query_plan,
 
                 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);
+                }
             }
 
+            if (!rename_dag.getOutputs().empty())
+                interpolate_actions_dag = ActionsDAG::merge(std::move(rename_dag), std::move(interpolate_actions_dag));
+
             interpolate_actions_dag.removeUnusedActions();
         }
 
diff --git a/src/Planner/PlannerActionsVisitor.cpp b/src/Planner/PlannerActionsVisitor.cpp
index 1960855792c..57457493844 100644
--- a/src/Planner/PlannerActionsVisitor.cpp
+++ b/src/Planner/PlannerActionsVisitor.cpp
@@ -491,7 +491,16 @@ public:
     {
         auto it = node_name_to_node.find(node_name);
         if (it != node_name_to_node.end())
-            return it->second;
+        {
+            /// 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;
+        }
 
         const auto * node = &actions_dag.addColumn(column);
         node_name_to_node[node->result_name] = node;
diff --git a/src/Planner/PlannerExpressionAnalysis.cpp b/src/Planner/PlannerExpressionAnalysis.cpp
index 2b67c96d843..ed3f78193ee 100644
--- a/src/Planner/PlannerExpressionAnalysis.cpp
+++ b/src/Planner/PlannerExpressionAnalysis.cpp
@@ -462,6 +462,9 @@ 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/findParallelReplicasQuery.cpp b/src/Planner/findParallelReplicasQuery.cpp
index c89a70be541..39edb1e6516 100644
--- a/src/Planner/findParallelReplicasQuery.cpp
+++ b/src/Planner/findParallelReplicasQuery.cpp
@@ -113,13 +113,13 @@ std::stack<const QueryNode *> getSupportingParallelReplicasQuery(const IQueryTre
     return res;
 }
 
-class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>
+class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitorWithContext<ReplaceTableNodeToDummyVisitor>
 {
 public:
-    using Base = InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>;
+    using Base = InDepthQueryTreeVisitorWithContext<ReplaceTableNodeToDummyVisitor>;
     using Base::Base;
 
-    void visitImpl(const QueryTreeNodePtr & node)
+    void enterImpl(QueryTreeNodePtr & node)
     {
         auto * table_node = node->as<TableNode>();
         auto * table_function_node = node->as<TableFunctionNode>();
@@ -134,21 +134,19 @@ public:
                 ColumnsDescription(storage_snapshot->getColumns(get_column_options)),
                 storage_snapshot);
 
-            auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), context);
+            auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), getContext());
 
             dummy_table_node->setAlias(node->getAlias());
             replacement_map.emplace(node.get(), std::move(dummy_table_node));
         }
     }
 
-    ContextPtr context;
     std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;
 };
 
-QueryTreeNodePtr replaceTablesWithDummyTables(const QueryTreeNodePtr & query, const ContextPtr & context)
+QueryTreeNodePtr replaceTablesWithDummyTables(QueryTreeNodePtr query, const ContextPtr & context)
 {
-    ReplaceTableNodeToDummyVisitor visitor;
-    visitor.context = context;
+    ReplaceTableNodeToDummyVisitor visitor(context);
     visitor.visit(query);
 
     return query->cloneAndReplace(visitor.replacement_map);
diff --git a/src/Planner/findQueryForParallelReplicas.h b/src/Planner/findQueryForParallelReplicas.h
index f5dc69dfa0e..cdce4ad0b47 100644
--- a/src/Planner/findQueryForParallelReplicas.h
+++ b/src/Planner/findQueryForParallelReplicas.h
@@ -13,7 +13,7 @@ using QueryTreeNodePtr = std::shared_ptr<IQueryTreeNode>;
 
 struct SelectQueryOptions;
 
-/// Find a qury which can be executed with parallel replicas up to WithMergableStage.
+/// Find a query which can be executed with parallel replicas up to WithMergableStage.
 /// Returned query will always contain some (>1) subqueries, possibly with joins.
 const QueryNode * findQueryForParallelReplicas(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options);
 
diff --git a/src/Processors/Chunk.h b/src/Processors/Chunk.h
index 1348966c0d3..f45e2c4619e 100644
--- a/src/Processors/Chunk.h
+++ b/src/Processors/Chunk.h
@@ -22,7 +22,7 @@ public:
 };
 
 
-template<class Derived>
+template <typename Derived>
 class ChunkInfoCloneable : public ChunkInfo
 {
 public:
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index 81622389ada..8687886447a 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/Transforms/FillingTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
+#include <Interpreters/ExpressionActions.h>
 #include <Common/JSONBuilder.h>
 
 namespace DB
@@ -58,14 +59,25 @@ void FillingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
 
 void FillingStep::describeActions(FormatSettings & settings) const
 {
-    settings.out << String(settings.offset, ' ');
+    String prefix(settings.offset, settings.indent_char);
+    settings.out << prefix;
     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()
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 483876dd293..51143a519a1 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -119,8 +119,10 @@ 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;
 }
 
@@ -1970,8 +1972,10 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
     }
 
     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);
 
diff --git a/src/Processors/Sources/MongoDBSource.cpp b/src/Processors/Sources/MongoDBSource.cpp
index 0d583cf6be5..e00a541b300 100644
--- a/src/Processors/Sources/MongoDBSource.cpp
+++ b/src/Processors/Sources/MongoDBSource.cpp
@@ -4,6 +4,7 @@
 #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>
@@ -17,6 +18,7 @@
 #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>
 
@@ -45,8 +47,28 @@ 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)
     {
@@ -149,12 +171,20 @@ namespace
         else if (which.isUUID())
             parser = [](const Poco::MongoDB::Element & value, const std::string & name) -> Field
             {
-                if (value.type() != Poco::MongoDB::ElementTraits<String>::TypeId)
-                    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected String (UUID), got type id = {} for column {}",
+                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 {}",
                                         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());
@@ -286,8 +316,14 @@ 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/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index f76e2d64368..8de248a9c95 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -2772,19 +2772,23 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
                 parameters);
         }, properties}, AggregateFunctionFactory::Case::Insensitive);
 
-    factory.registerFunction("dense_rank", {[](const std::string & name,
+    factory.registerFunction("denseRank", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionDenseRank>(name, argument_types,
                 parameters);
-        }, properties}, AggregateFunctionFactory::Case::Insensitive);
+        }, properties});
 
-    factory.registerFunction("percent_rank", {[](const std::string & name,
+    factory.registerAlias("dense_rank", "denseRank", AggregateFunctionFactory::Case::Insensitive);
+
+    factory.registerFunction("percentRank", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionPercentRank>(name, argument_types,
                 parameters);
-        }, properties}, AggregateFunctionFactory::Case::Insensitive);
+        }, properties});
+
+    factory.registerAlias("percent_rank", "percentRank", AggregateFunctionFactory::Case::Insensitive);
 
     factory.registerFunction("row_number", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 69bffac9160..dfb43c4e75d 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -566,6 +566,7 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
     }
 
     const ActionsDAG::Node * res = nullptr;
+    bool handled_inversion = false;
 
     switch (node.type)
     {
@@ -582,7 +583,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 manes, but DAG subtrees instead.
+                /// Ideally, we should not compare names, but DAG subtrees instead.
                 name = ASTLiteral(column_const->getDataColumn()[0]).getColumnName();
             else
                 name = node.result_name;
@@ -593,9 +594,9 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
         case (ActionsDAG::ActionType::ALIAS):
         {
             /// Ignore aliases
-            const auto & alias = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
-            to_inverted[&node] = &alias;
-            return alias;
+            res = &cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
+            handled_inversion = true;
+            break;
         }
         case (ActionsDAG::ActionType::ARRAY_JOIN):
         {
@@ -608,20 +609,10 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
             auto name = node.function_base->getName();
             if (name == "not")
             {
-                const auto & arg = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, !need_inversion);
-                to_inverted[&node] = &arg;
-                return arg;
+                res = &cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, !need_inversion);
+                handled_inversion = true;
             }
-
-            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")
+            else if (name == "indexHint")
             {
                 ActionsDAG::NodeRawConstPtrs children;
                 if (const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(node.function_base.get()))
@@ -636,12 +627,10 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
                     }
                 }
 
-                const auto & func = inverted_dag.addFunction(node.function_base, children, "");
-                to_inverted[&node] = &func;
-                return func;
+                res = &inverted_dag.addFunction(node.function_base, children, "");
+                handled_inversion = true;
             }
-
-            if (need_inversion && (name == "and" || name == "or"))
+            else if (need_inversion && (name == "and" || name == "or"))
             {
                 ActionsDAG::NodeRawConstPtrs children(node.children);
 
@@ -659,32 +648,56 @@ 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.
-                const auto & func = inverted_dag.addFunction(function_builder, children, "");
-                to_inverted[&node] = &func;
-                return func;
+                res = &inverted_dag.addFunction(function_builder, children, "");
+                handled_inversion = true;
             }
-
-            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())
+            else
             {
-                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;
-            }
+                ActionsDAG::NodeRawConstPtrs children(node.children);
 
-            res = &inverted_dag.addFunction(node.function_base, children, "");
-            chassert(res->result_type == node.result_type);
+                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, "");
+                    }
+                }
+            }
         }
     }
 
-    if (need_inversion)
+    if (!handled_inversion && need_inversion)
         res = &inverted_dag.addFunction(FunctionFactory::instance().get("not", context), {res}, "");
 
     to_inverted[&node] = res;
diff --git a/src/Storages/ObjectStorage/HDFS/Configuration.cpp b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
index e8071be6f02..85eb29a3868 100644
--- a/src/Storages/ObjectStorage/HDFS/Configuration.cpp
+++ b/src/Storages/ObjectStorage/HDFS/Configuration.cpp
@@ -142,11 +142,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: {}", url_);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. It should have the following structure 'hdfs://<host_name>:<port>/path'", url_);
 
     pos = url_.find('/', pos + 2);
     if (pos == std::string::npos)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad hdfs url: {}", url_);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad HDFS URL: {}. It should have the following structure 'hdfs://<host_name>:<port>/path'", url_);
 
     path = url_.substr(pos + 1);
     if (!path.starts_with('/'))
@@ -155,7 +155,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::addStructureAndFormatToArgs(
diff --git a/src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp b/src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp
index 365828bcc40..7f8727eea1c 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/S3/Configuration.cpp b/src/Storages/ObjectStorage/S3/Configuration.cpp
index 094ca069e7a..7542f59dcc4 100644
--- a/src/Storages/ObjectStorage/S3/Configuration.cpp
+++ b/src/Storages/ObjectStorage/S3/Configuration.cpp
@@ -142,14 +142,14 @@ ObjectStoragePtr StorageS3Configuration::createObjectStorage(ContextPtr context,
 
 void StorageS3Configuration::fromNamedCollection(const NamedCollection & collection, ContextPtr context)
 {
-    const auto settings = context->getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     validateNamedCollection(collection, required_configuration_keys, optional_configuration_keys);
 
     auto filename = collection.getOrDefault<String>("filename", "");
     if (!filename.empty())
-        url = S3::URI(std::filesystem::path(collection.get<String>("url")) / filename);
+        url = S3::URI(std::filesystem::path(collection.get<String>("url")) / filename, settings.allow_archive_path_syntax);
     else
-        url = S3::URI(collection.get<String>("url"));
+        url = S3::URI(collection.get<String>("url"), settings.allow_archive_path_syntax);
 
     auth_settings.access_key_id = collection.getOrDefault<String>("access_key_id", "");
     auth_settings.secret_access_key = collection.getOrDefault<String>("secret_access_key", "");
@@ -330,7 +330,7 @@ void StorageS3Configuration::fromAST(ASTs & args, ContextPtr context, bool with_
     }
 
     /// This argument is always the first
-    url = S3::URI(checkAndGetLiteralArgument<String>(args[0], "url"));
+    url = S3::URI(checkAndGetLiteralArgument<String>(args[0], "url"), context->getSettingsRef().allow_archive_path_syntax);
 
     if (engine_args_to_idx.contains("format"))
     {
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 98cd5c4dfa9..8c079aa4600 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -25,6 +25,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Archives/createArchiveReader.h>
 #include <IO/Archives/IArchiveReader.h>
+#include <IO/Archives/ArchiveUtils.h>
 #include <IO/PeekableReadBuffer.h>
 #include <IO/AsynchronousReadBufferFromFile.h>
 #include <Disks/IO/IOUringReader.h>
@@ -2207,7 +2208,11 @@ void registerStorageFile(StorageFactory & factory)
                 else if (type == Field::Types::UInt64)
                     source_fd = static_cast<int>(literal->value.get<UInt64>());
                 else if (type == Field::Types::String)
-                    StorageFile::parseFileSource(literal->value.get<String>(), source_path, storage_args.path_to_archive);
+                    StorageFile::parseFileSource(
+                        literal->value.get<String>(),
+                        source_path,
+                        storage_args.path_to_archive,
+                        factory_args.getLocalContext()->getSettingsRef().allow_archive_path_syntax);
                 else
                     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Second argument must be path or file descriptor");
             }
@@ -2234,8 +2239,14 @@ SchemaCache & StorageFile::getSchemaCache(const ContextPtr & context)
     return schema_cache;
 }
 
-void StorageFile::parseFileSource(String source, String & filename, String & path_to_archive)
+void StorageFile::parseFileSource(String source, String & filename, String & path_to_archive, bool allow_archive_path_syntax)
 {
+    if (!allow_archive_path_syntax)
+    {
+        filename = std::move(source);
+        return;
+    }
+
     size_t pos = source.find("::");
     if (pos == String::npos)
     {
@@ -2247,18 +2258,21 @@ void StorageFile::parseFileSource(String source, String & filename, String & pat
     while (path_to_archive_view.ends_with(' '))
         path_to_archive_view.remove_suffix(1);
 
-    if (path_to_archive_view.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path to archive is empty");
-
-    path_to_archive = path_to_archive_view;
-
     std::string_view filename_view = std::string_view{source}.substr(pos + 2);
-    while (filename_view.front() == ' ')
+    while (filename_view.starts_with(' '))
         filename_view.remove_prefix(1);
 
-    if (filename_view.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Filename is empty");
+    /// possible situations when the first part can be archive is only if one of the following is true:
+    /// - it contains supported extension
+    /// - it contains characters that could mean glob expression
+    if (filename_view.empty() || path_to_archive_view.empty()
+        || (!hasSupportedArchiveExtension(path_to_archive_view) && path_to_archive_view.find_first_of("*?{") == std::string_view::npos))
+    {
+        filename = std::move(source);
+        return;
+    }
 
+    path_to_archive = path_to_archive_view;
     filename = filename_view;
 }
 
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index 895a8a663b8..bb969c1877c 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -128,7 +128,7 @@ public:
 
     static SchemaCache & getSchemaCache(const ContextPtr & context);
 
-    static void parseFileSource(String source, String & filename, String & path_to_archive);
+    static void parseFileSource(String source, String & filename, String & path_to_archive, bool allow_archive_path_syntax);
 
     static ArchiveInfo getArchiveInfo(
         const std::string & path_to_archive,
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 160c8d6270e..9c5c07ae49f 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -40,10 +40,10 @@ ColumnsDescription StorageSystemClusters::getColumnsDescription()
     return description;
 }
 
-void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
+void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8> columns_mask) const
 {
     for (const auto & name_and_cluster : context->getClusters())
-        writeCluster(res_columns, name_and_cluster, {});
+        writeCluster(res_columns, columns_mask, name_and_cluster, /* replicated= */ nullptr);
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
     for (const auto & name_and_database : databases)
@@ -52,18 +52,15 @@ void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr co
         {
 
             if (auto database_cluster = replicated->tryGetCluster())
-                writeCluster(res_columns, {name_and_database.first, database_cluster},
-                             replicated->tryGetAreReplicasActive(database_cluster));
+                writeCluster(res_columns, columns_mask, {name_and_database.first, database_cluster}, replicated);
 
             if (auto database_cluster = replicated->tryGetAllGroupsCluster())
-                writeCluster(res_columns, {DatabaseReplicated::ALL_GROUPS_CLUSTER_PREFIX + name_and_database.first, database_cluster},
-                             replicated->tryGetAreReplicasActive(database_cluster));
+                writeCluster(res_columns, columns_mask, {DatabaseReplicated::ALL_GROUPS_CLUSTER_PREFIX + name_and_database.first, database_cluster}, replicated);
         }
     }
 }
 
-void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster,
-                                         const std::vector<UInt8> & is_active)
+void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const std::vector<UInt8> & columns_mask, const NameAndCluster & name_and_cluster, const DatabaseReplicated * replicated)
 {
     const String & cluster_name = name_and_cluster.first;
     const ClusterPtr & cluster = name_and_cluster.second;
@@ -79,30 +76,55 @@ void StorageSystemClusters::writeCluster(MutableColumns & res_columns, const Nam
 
         for (size_t replica_index = 0; replica_index < shard_addresses.size(); ++replica_index)
         {
-            size_t i = 0;
+            size_t src_index = 0, res_index = 0;
             const auto & address = shard_addresses[replica_index];
 
-            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++]);
+            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);
+            if (columns_mask[src_index++])
+            {
+                std::vector<UInt8> is_active;
+                if (replicated)
+                    is_active = replicated->tryGetAreReplicasActive(name_and_cluster.second);
+
+                if (is_active.empty())
+                    res_columns[res_index++]->insertDefault();
+                else
+                    res_columns[res_index++]->insert(is_active[replica_idx++]);
+            }
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index 0f7c792261d..f6adb902f43 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -10,6 +10,7 @@ namespace DB
 
 class Context;
 class Cluster;
+class DatabaseReplicated;
 
 /** Implements system table 'clusters'
   *  that allows to obtain information about available clusters
@@ -26,8 +27,9 @@ 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>) const override;
-    static void writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster, const std::vector<UInt8> & is_active);
+    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; }
 };
 
 }
diff --git a/src/Storages/System/StorageSystemScheduler.cpp b/src/Storages/System/StorageSystemScheduler.cpp
index 339a59e88a5..b42c807d6fc 100644
--- a/src/Storages/System/StorageSystemScheduler.cpp
+++ b/src/Storages/System/StorageSystemScheduler.cpp
@@ -31,6 +31,7 @@ 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>()),
@@ -96,6 +97,7 @@ 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/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 1b6d86f8fa5..af327cfe54e 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -26,7 +26,7 @@ void TableFunctionFile::parseFirstArguments(const ASTPtr & arg, const ContextPtr
     if (context->getApplicationType() != Context::ApplicationType::LOCAL)
     {
         ITableFunctionFileLike::parseFirstArguments(arg, context);
-        StorageFile::parseFileSource(std::move(filename), filename, path_to_archive);
+        StorageFile::parseFileSource(std::move(filename), filename, path_to_archive, context->getSettingsRef().allow_archive_path_syntax);
         return;
     }
 
@@ -42,7 +42,8 @@ void TableFunctionFile::parseFirstArguments(const ASTPtr & arg, const ContextPtr
         else if (filename == "stderr")
             fd = STDERR_FILENO;
         else
-            StorageFile::parseFileSource(std::move(filename), filename, path_to_archive);
+            StorageFile::parseFileSource(
+                std::move(filename), filename, path_to_archive, context->getSettingsRef().allow_archive_path_syntax);
     }
     else if (type == Field::Types::Int64 || type == Field::Types::UInt64)
     {
@@ -63,9 +64,12 @@ std::optional<String> TableFunctionFile::tryGetFormatFromFirstArgument()
         return FormatFactory::instance().tryGetFormatFromFileName(filename);
 }
 
-StoragePtr TableFunctionFile::getStorage(const String & source,
-    const String & format_, const ColumnsDescription & columns,
-    ContextPtr global_context, const std::string & table_name,
+StoragePtr TableFunctionFile::getStorage(
+    const String & source,
+    const String & format_,
+    const ColumnsDescription & columns,
+    ContextPtr global_context,
+    const std::string & table_name,
     const std::string & compression_method_) const
 {
     // For `file` table function, we are going to use format settings from the
diff --git a/tests/ci/artifactory.py b/tests/ci/artifactory.py
index 86dcaf79854..f3d7d24f717 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,9 +30,6 @@ 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
@@ -52,20 +49,26 @@ 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.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
+        elif self.app == MountPointApp.GEESEFS:
+            self.cache_dir = "/home/ubuntu/geesefs_cache"
             self.aux_mount_options += (
-                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"
+                f" --cache={self.cache_dir} " if self.CACHE_ENABLED else ""
             )
-            # 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}"
+            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}"
         else:
             assert False
 
@@ -79,22 +82,17 @@ class R2MountPoint:
         )
 
         _TEST_MOUNT_CMD = f"mount | grep -q {self.MOUNT_POINT}"
-        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)
+        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)
         time.sleep(3)
-        Shell.run(_TEST_MOUNT_CMD, check=True)
+        Shell.check(_TEST_MOUNT_CMD, strict=True, verbose=True)
 
     @classmethod
     def teardown(cls):
-        print(f"Unmount [{cls.MOUNT_POINT}]")
-        Shell.run(f"umount {cls.MOUNT_POINT}")
+        Shell.check(f"umount {cls.MOUNT_POINT}", verbose=True)
 
 
 class RepoCodenames(metaclass=WithIter):
@@ -129,10 +127,9 @@ 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 command:")
-        print(f"  {cmd}")
-        Shell.run(cmd, check=True)
-        Shell.run("sync")
+        print("Running export commands:")
+        Shell.check(cmd, strict=True, verbose=True)
+        Shell.check("sync")
 
         if self.codename == RepoCodenames.LTS:
             packages_with_version = [
@@ -144,18 +141,24 @@ class DebianArtifactory:
             cmd = f"{REPREPRO_CMD_PREFIX} copy {RepoCodenames.STABLE} {RepoCodenames.LTS} {' '.join(packages_with_version)}"
             print("Running copy command:")
             print(f"  {cmd}")
-            Shell.run(cmd, check=True)
-            Shell.run("sync")
+            Shell.check(cmd, strict=True)
+            Shell.check("sync")
 
     def test_packages(self):
-        Shell.run("docker pull ubuntu:latest")
+        Shell.check("docker pull ubuntu:latest", strict=True)
         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}")
-        Shell.run(cmd, check=True)
-        self.release_info.debian_command = debian_command
+        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
         self.release_info.dump()
 
 
@@ -204,34 +207,40 @@ 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 --verbose {dest_dir}",
+            f"createrepo_c --local-sqlite --workers=2 --update --skip-stat --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:
-            print("Running command:")
-            print(f"    {command}")
-            Shell.run(command, check=True)
+            Shell.check(command, strict=True, verbose=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.run(update_public_key, check=True))
+        pub_key_path.write_text(Shell.get_output_or_raise(update_public_key))
         if codename == RepoCodenames.LTS:
             self.export_packages(RepoCodenames.STABLE)
-        Shell.run("sync")
+        Shell.check("sync")
 
     def test_packages(self):
-        Shell.run("docker pull fedora:latest")
+        Shell.check("docker pull fedora:latest", strict=True)
         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}")
-        Shell.run(cmd, check=True)
-        self.release_info.rpm_command = rpm_command
+        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
         self.release_info.dump()
 
 
@@ -271,27 +280,31 @@ class TgzArtifactory:
 
         if codename == RepoCodenames.LTS:
             self.export_packages(RepoCodenames.STABLE)
-        Shell.run("sync")
+        Shell.check("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.run(
+        Shell.check(
             cmd,
-            check=True,
+            strict=True,
+            verbose=True,
         )
-        Shell.run(
+        Shell.check(
             f"curl -o {tgz_sha_file} -f0 {self.repo_url}/stable/clickhouse-client-{self.version}-arm64.tgz.sha512",
-            check=True,
+            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"
         )
-        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.run("rm /tmp/tmp.tgz*")
-        self.release_info.tgz_command = cmd
+        Shell.check("rm /tmp/tmp.tgz*", verbose=True)
+        self.release_info.tgz = cmd
         self.release_info.dump()
 
 
@@ -342,11 +355,11 @@ if __name__ == "__main__":
     args = parse_args()
 
     """
-    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
+    S3FS - very slow with a big repo
+    RCLONE - fuse had many different errors with r2 remote and completely removed
+    GEESEFS ? 
     """
-    mp = R2MountPoint(MountPointApp.S3FS, dry_run=args.dry_run)
+    mp = R2MountPoint(MountPointApp.GEESEFS, 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 f2386fe207f..3cc88634004 100644
--- a/tests/ci/auto_release.py
+++ b/tests/ci/auto_release.py
@@ -85,7 +85,7 @@ class AutoReleaseInfo:
 def _prepare(token):
     assert len(token) > 10
     os.environ["GH_TOKEN"] = token
-    Shell.run("gh auth status", check=True)
+    Shell.check("gh auth status")
 
     gh = GitHub(token)
     prs = gh.get_release_pulls(GITHUB_REPOSITORY)
@@ -106,9 +106,8 @@ def _prepare(token):
         latest_release_tag_ref = refs[-1]
         latest_release_tag = repo.get_git_tag(latest_release_tag_ref.object.sha)
 
-        commits = Shell.run(
+        commits = Shell.get_output_or_raise(
             f"git rev-list --first-parent {latest_release_tag.tag}..origin/{pr.head.ref}",
-            check=True,
         ).split("\n")
         commit_num = len(commits)
         print(
@@ -128,15 +127,13 @@ def _prepare(token):
             )
             commit_num -= 1
 
-            is_completed = CI.GHActions.check_wf_completed(
-                token=token, commit_sha=commit
-            )
+            is_completed = CI.GH.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
 
-            commit_ci_status = CI.GHActions.get_commit_status_by_name(
+            commit_ci_status = CI.GH.get_commit_status_by_name(
                 token=token,
                 commit_sha=commit,
                 status_name=(CI.JobNames.BUILD_CHECK, "ClickHouse build check"),
diff --git a/tests/ci/changelog.py b/tests/ci/changelog.py
index 3ba618f3ae5..929f0f3523a 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
+from typing import Any, Dict, List, Optional, TextIO, Tuple
 
 import tqdm  # type: ignore
 from github.GithubException import RateLimitExceededException, UnknownObjectException
@@ -19,6 +19,8 @@ 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 get_robot_token import get_best_robot_token
+from ci_utils import Shell
 from version_helper import (
     FILE_WITH_VERSION_PATH,
     get_abs_path,
@@ -171,6 +173,7 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--gh-user-or-token",
         help="user name or GH token to authenticate",
+        default=get_best_robot_token(),
     )
     parser.add_argument(
         "--gh-password",
@@ -397,6 +400,21 @@ 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()
@@ -446,6 +464,22 @@ 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/ci.py b/tests/ci/ci.py
index 935fe472e50..86c6b7deb9b 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 GHActions, normalize_string, Utils
+from ci_utils import GH, normalize_string, Utils
 from clickhouse_helper import (
     CiLogsCredentials,
     ClickHouseHelper,
@@ -368,7 +368,7 @@ def _pre_action(s3, job_name, batch, indata, pr_info):
                 )
                 to_be_skipped = True
                 # skip_status = SUCCESS already there
-                GHActions.print_in_group("Commit Status Data", job_status)
+                GH.print_in_group("Commit Status Data", job_status)
 
     # create pre report
     jr = JobReport.create_pre_report(status=skip_status, job_skipped=to_be_skipped)
@@ -1019,7 +1019,9 @@ def _get_ext_check_name(check_name: str) -> str:
     return check_name_with_group
 
 
-def _cancel_pr_wf(s3: S3Helper, pr_number: int, cancel_sync: bool = False) -> None:
+def _cancel_pr_workflow(
+    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:
@@ -1368,12 +1370,12 @@ def main() -> int:
         assert indata, "Run config must be provided via --infile"
         _update_gh_statuses_action(indata=indata, s3=s3)
 
-    ### CANCEL PREVIOUS WORKFLOW RUN
+    ### CANCEL THE PREVIOUS WORKFLOW RUN
     elif args.cancel_previous_run:
         if pr_info.is_merge_queue:
-            _cancel_pr_wf(s3, pr_info.merged_pr)
+            _cancel_pr_workflow(s3, pr_info.merged_pr)
         elif pr_info.is_pr:
-            _cancel_pr_wf(s3, pr_info.number, cancel_sync=True)
+            _cancel_pr_workflow(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 dfb5885270a..f0e73e925fe 100644
--- a/tests/ci/ci_buddy.py
+++ b/tests/ci/ci_buddy.py
@@ -8,7 +8,7 @@ import requests
 from botocore.exceptions import ClientError
 
 from pr_info import PRInfo
-from ci_utils import Shell, GHActions
+from ci_config import CI
 
 
 class CIBuddy:
@@ -31,10 +31,19 @@ class CIBuddy:
         self.sha = pr_info.sha[:10]
 
     def check_workflow(self):
-        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)
+        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
+                )
 
     @staticmethod
     def _get_webhooks():
@@ -74,10 +83,13 @@ class CIBuddy:
         message = title
         if isinstance(body, dict):
             for name, value in body.items():
-                if "commit_sha" in name:
+                if "sha" in name and value and len(value) == 40:
                     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"
@@ -120,8 +132,12 @@ class CIBuddy:
     ) -> None:
         instance_id, instance_type = "unknown", "unknown"
         if with_instance_info:
-            instance_id = Shell.run("ec2metadata --instance-id") or instance_id
-            instance_type = Shell.run("ec2metadata --instance-type") or instance_type
+            instance_id = (
+                CI.Shell.get_output("ec2metadata --instance-id") or instance_id
+            )
+            instance_type = (
+                CI.Shell.get_output("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:"
diff --git a/tests/ci/ci_cache.py b/tests/ci/ci_cache.py
index 85eabb84f9f..4846233ab03 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 is_hex, GHActions
+from ci_utils import is_hex, GH
 from commit_status_helper import CommitStatusData
 from env_helper import (
     TEMP_PATH,
@@ -258,15 +258,15 @@ class CiCache:
     def print_status(self):
         print(f"Cache enabled: [{self.enabled}]")
         for record_type in self.RecordType:
-            GHActions.print_in_group(
+            GH.print_in_group(
                 f"Cache records: [{record_type}]", list(self.records[record_type])
             )
-        GHActions.print_in_group(
+        GH.print_in_group(
             "Jobs to do:",
             list(self.jobs_to_do.items()),
         )
-        GHActions.print_in_group("Jobs to skip:", self.jobs_to_skip)
-        GHActions.print_in_group(
+        GH.print_in_group("Jobs to skip:", self.jobs_to_skip)
+        GH.print_in_group(
             "Jobs to wait:",
             list(self.jobs_to_wait.items()),
         )
@@ -788,7 +788,7 @@ class CiCache:
 
         while round_cnt < MAX_ROUNDS_TO_WAIT:
             round_cnt += 1
-            GHActions.print_in_group(
+            GH.print_in_group(
                 f"Wait pending jobs, round [{round_cnt}/{MAX_ROUNDS_TO_WAIT}]:",
                 list(self.jobs_to_wait),
             )
@@ -853,7 +853,7 @@ class CiCache:
                     # make up for 2 iterations in dry_run
                     expired_sec += int(TIMEOUT / 2) + 1
 
-        GHActions.print_in_group(
+        GH.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 a7df884a091..c031ca9b805 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -34,7 +34,8 @@ 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 GHActions as GHActions
+    from ci_utils import GH as GH
+    from ci_utils import Shell as Shell
     from ci_definitions import Labels as Labels
     from ci_definitions import TRUSTED_CONTRIBUTORS as TRUSTED_CONTRIBUTORS
     from ci_definitions import WorkFlowNames as WorkFlowNames
diff --git a/tests/ci/ci_definitions.py b/tests/ci/ci_definitions.py
index 054b554b8fa..de6791acda8 100644
--- a/tests/ci/ci_definitions.py
+++ b/tests/ci/ci_definitions.py
@@ -112,6 +112,7 @@ class WorkFlowNames(metaclass=WithIter):
     """
 
     JEPSEN = "JepsenWorkflow"
+    CreateRelease = "CreateRelease"
 
 
 class BuildNames(metaclass=WithIter):
@@ -554,7 +555,7 @@ class CommonJobConfigs:
         run_command="sqllogic_test.py",
         timeout=10800,
         release_only=True,
-        runner_type=Runners.STYLE_CHECKER,
+        runner_type=Runners.FUNC_TESTER,
     )
     SQL_TEST = JobConfig(
         job_name_keyword="sqltest",
@@ -578,10 +579,11 @@ class CommonJobConfigs:
     DOCKER_SERVER = JobConfig(
         job_name_keyword="docker",
         required_on_release_branch=True,
-        run_command='docker_server.py --check-name "$CHECK_NAME" --release-type head --allow-build-reuse',
+        run_command='docker_server.py --check-name "$CHECK_NAME" --tag-type head --allow-build-reuse',
         digest=DigestConfig(
             include_paths=[
                 "tests/ci/docker_server.py",
+                "tests/ci/docker_images_helper.py",
                 "./docker/server",
             ]
         ),
diff --git a/tests/ci/ci_metadata.py b/tests/ci/ci_metadata.py
index a767d102811..67106262634 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 GHActions
+from ci_utils import GH
 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}]"
 
-        GHActions.print_in_group(
+        GH.print_in_group(
             log_title,
             [f"run_id: {self.run_id}"],
         )
diff --git a/tests/ci/ci_utils.py b/tests/ci/ci_utils.py
index 447aac74c7f..dae1520afb6 100644
--- a/tests/ci/ci_utils.py
+++ b/tests/ci/ci_utils.py
@@ -2,6 +2,7 @@ import json
 import os
 import re
 import subprocess
+import sys
 import time
 from contextlib import contextmanager
 from pathlib import Path
@@ -15,6 +16,8 @@ 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", "")
 
 
 LABEL_CATEGORIES = {
@@ -82,7 +85,7 @@ def normalize_string(string: str) -> str:
     return res
 
 
-class GHActions:
+class GH:
     class ActionsNames:
         RunConfig = "RunConfig"
 
@@ -116,6 +119,14 @@ class GHActions:
         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()
@@ -188,73 +199,79 @@ class GHActions:
         return False
 
     @staticmethod
-    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)
+    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)
         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'
+        )
+        return latest_branch == branch
+
 
 class Shell:
     @classmethod
-    def run_strict(cls, command):
+    def get_output_or_raise(cls, command):
+        return cls.get_output(command, strict=True)
+
+    @classmethod
+    def get_output(cls, command, strict=False):
         res = subprocess.run(
             command,
             shell=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
-            check=True,
+            check=strict,
         )
         return res.stdout.strip()
 
     @classmethod
-    def run(cls, command, check=False, dry_run=False, **kwargs):
+    def check(
+        cls,
+        command,
+        strict=False,
+        verbose=False,
+        dry_run=False,
+        stdin_str=None,
+        **kwargs,
+    ):
         if dry_run:
             print(f"Dry-ryn. Would run command [{command}]")
-            return ""
-        print(f"Run command [{command}]")
-        res = ""
-        result = subprocess.run(
+            return True
+        if verbose:
+            print(f"Run command [{command}]")
+        proc = subprocess.Popen(
             command,
             shell=True,
+            stderr=subprocess.STDOUT,
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            check=False,
+            stdin=subprocess.PIPE if stdin_str else None,
+            universal_newlines=True,
+            start_new_session=True,
+            bufsize=1,
+            errors="backslashreplace",
             **kwargs,
         )
-        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
+        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
 
 
 class Utils:
@@ -278,7 +295,7 @@ class Utils:
 
     @staticmethod
     def clear_dmesg():
-        Shell.run("sudo dmesg --clear ||:")
+        Shell.check("sudo dmesg --clear", verbose=True)
 
     @staticmethod
     def check_pr_description(pr_body: str, repo_name: str) -> Tuple[str, str]:
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index 287970cce9a..0725f7100d1 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -3,6 +3,7 @@ import fileinput
 import json
 import logging
 import time
+import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -298,6 +299,11 @@ 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 fdc9c002b66..908ac4a7dca 100644
--- a/tests/ci/commit_status_helper.py
+++ b/tests/ci/commit_status_helper.py
@@ -301,7 +301,7 @@ def get_worst_state(statuses: CommitStatuses) -> StatusType:
 
 
 def create_ci_report(pr_info: PRInfo, statuses: CommitStatuses) -> str:
-    """The function converst the statuses to TestResults and uploads the report
+    """The function converts 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:
diff --git a/tests/ci/create_release.py b/tests/ci/create_release.py
index a0b4083b673..b4e08f29dbe 100755
--- a/tests/ci/create_release.py
+++ b/tests/ci/create_release.py
@@ -10,9 +10,8 @@ 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, GHActions
+from ci_utils import Shell, GH
 from ci_buddy import CIBuddy
 from version_helper import (
     FILE_WITH_VERSION_PATH,
@@ -43,6 +42,7 @@ 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"
 
 
@@ -68,13 +68,14 @@ 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_description == ReleaseProgressDescription.OK
+                self.release_info.progress_status == ReleaseProgressDescription.OK
             ), "Must be OK on the start of new context"
             self.release_info.release_progress = self.release_progress
             self.release_info.dump()
@@ -83,9 +84,9 @@ class ReleaseContextManager:
     def __exit__(self, exc_type, exc_value, traceback):
         assert self.release_info
         if exc_type is not None:
-            self.release_info.progress_description = ReleaseProgressDescription.FAILED
+            self.release_info.progress_status = ReleaseProgressDescription.FAILED
         else:
-            self.release_info.progress_description = ReleaseProgressDescription.OK
+            self.release_info.progress_status = ReleaseProgressDescription.OK
         self.release_info.dump()
 
 
@@ -95,19 +96,21 @@ class ReleaseInfo:
     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_command: str = ""
-    rpm_command: str = ""
-    tgz_command: str = ""
-    docker_command: str = ""
+    debian: str = ""
+    rpm: str = ""
+    tgz: str = ""
+    docker: str = ""
     release_progress: str = ""
-    progress_description: str = ""
+    progress_status: str = ""
 
     def is_patch(self):
         return self.release_branch != "master"
@@ -127,22 +130,26 @@ class ReleaseInfo:
             print(json.dumps(dataclasses.asdict(self), indent=2), file=f)
         return self
 
-    def prepare(self, commit_ref: str, release_type: str) -> "ReleaseInfo":
+    def prepare(
+        self, commit_ref: str, release_type: str, skip_tag_check: bool
+    ) -> "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
-            Shell.run(
+            Shell.check(
                 f"git merge-base --is-ancestor {commit_ref} origin/master",
-                check=True,
+                strict=True,
+                verbose=True,
             )
             with checkout(commit_ref):
-                commit_sha = Shell.run(f"git rev-parse {commit_ref}", check=True)
+                commit_sha = Shell.get_output_or_raise(f"git rev-list -n1 {commit_ref}")
                 # Git() must be inside "with checkout" contextmanager
                 git = Git()
                 version = get_version_from_repo(git=git)
@@ -154,13 +161,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.run_strict(
-                    f"git rev-parse {previous_release_tag}"
+                previous_release_sha = Shell.get_output_or_raise(
+                    f"git rev-list -n1 {previous_release_tag}"
                 )
                 assert previous_release_sha
         if release_type == "patch":
             with checkout(commit_ref):
-                commit_sha = Shell.run(f"git rev-parse {commit_ref}", check=True)
+                commit_sha = Shell.get_output_or_raise(f"git rev-list -n1 {commit_ref}")
                 # Git() must be inside "with checkout" contextmanager
                 git = Git()
                 version = get_version_from_repo(git=git)
@@ -168,11 +175,16 @@ class ReleaseInfo:
                 version.with_description(codename)
                 release_branch = f"{version.major}.{version.minor}"
                 release_tag = version.describe
-            Shell.run(f"{GIT_PREFIX} fetch origin {release_branch} --tags", check=True)
+            Shell.check(
+                f"{GIT_PREFIX} fetch origin {release_branch} --tags",
+                strict=True,
+                verbose=True,
+            )
             # check commit is right and on a right branch
-            Shell.run(
+            Shell.check(
                 f"git merge-base --is-ancestor {commit_ref} origin/{release_branch}",
-                check=True,
+                strict=True,
+                verbose=True,
             )
             if version.patch == 1:
                 expected_version = copy(version)
@@ -192,16 +204,20 @@ class ReleaseInfo:
                 expected_tag_prefix
             ) and git.latest_tag.endswith(expected_tag_suffix):
                 pass
-            else:
+            elif not skip_tag_check:
                 assert (
                     False
-                ), f"BUG: Unexpected latest tag [{git.latest_tag}] expected [{expected_tag_prefix}*{expected_tag_suffix}]"
+                ), f"BUG: Unexpected latest tag [{git.latest_tag}] expected [{expected_tag_prefix}*{expected_tag_suffix}]. Already Released?"
 
-            previous_release_sha = Shell.run_strict(
-                f"git rev-parse {previous_release_tag}"
+            previous_release_sha = Shell.get_output_or_raise(
+                f"git rev-list -n1 {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
@@ -210,7 +226,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
@@ -220,31 +236,33 @@ class ReleaseInfo:
         self.previous_release_tag = previous_release_tag
         self.previous_release_sha = previous_release_sha
         self.release_progress = ReleaseProgress.STARTED
-        self.progress_description = ReleaseProgressDescription.OK
+        self.progress_status = ReleaseProgressDescription.OK
+        self.latest = latest_release
         return self
 
     def push_release_tag(self, dry_run: bool) -> None:
         if dry_run:
             # remove locally created tag from prev run
-            Shell.run(
-                f"{GIT_PREFIX} tag -l | grep -q {self.release_tag} && git tag -d {self.release_tag} ||:"
+            Shell.check(
+                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.run(
+        Shell.check(
             f"{GIT_PREFIX} tag -a -m '{tag_message}' {self.release_tag} {self.commit_sha}",
-            check=True,
+            strict=True,
+            verbose=True,
         )
         cmd_push_tag = f"{GIT_PREFIX} push origin {self.release_tag}:{self.release_tag}"
-        Shell.run(cmd_push_tag, dry_run=dry_run, check=True)
+        Shell.check(cmd_push_tag, dry_run=dry_run, strict=True, verbose=True)
 
     @staticmethod
     def _create_gh_label(label: str, color_hex: str, dry_run: bool) -> None:
-        cmd = f"gh api repos/{GITHUB_REPOSITORY}/labels -f name={label} -f color={color_hex}"
-        Shell.run(cmd, dry_run=dry_run, check=True)
+        cmd = f"gh api repos/{CI.Envs.GITHUB_REPOSITORY}/labels -f name={label} -f color={color_hex}"
+        Shell.check(cmd, dry_run=dry_run, strict=True)
 
     def push_new_release_branch(self, dry_run: bool) -> None:
         assert (
@@ -261,7 +279,7 @@ 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.run(
+            Shell.check(
                 f"{GIT_PREFIX} branch -l | grep -q {new_release_branch} && git branch -d {new_release_branch}"
             )
         print(
@@ -275,7 +293,7 @@ class ReleaseInfo:
                 cmd_push_branch = (
                     f"{GIT_PREFIX} push --set-upstream origin {new_release_branch}"
                 )
-                Shell.run(cmd_push_branch, dry_run=dry_run, check=True)
+                Shell.check(cmd_push_branch, dry_run=dry_run, strict=True, verbose=True)
 
         print("Create and push backport tags for new release branch")
         ReleaseInfo._create_gh_label(
@@ -284,18 +302,22 @@ class ReleaseInfo:
         ReleaseInfo._create_gh_label(
             f"v{new_release_branch}-affected", "c2bfff", dry_run=dry_run
         )
-        Shell.run(
-            f"""gh pr create --repo {GITHUB_REPOSITORY} --title 'Release pull request for branch {new_release_branch}'
+        Shell.check(
+            f"""gh pr create --repo {CI.Envs.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,
+            strict=True,
+            verbose=True,
         )
 
+    def get_version_bump_branch(self):
+        return f"bump_version_{self.version}"
+
     def update_version_and_contributors_list(self, dry_run: bool) -> None:
         # Bump version, update contributors list, create PR
-        branch_upd_version_contributors = f"bump_version_{self.version}"
+        branch_upd_version_contributors = self.get_version_bump_branch()
         with checkout(self.commit_sha):
             git = Git()
             version = get_version_from_repo(git=git)
@@ -313,43 +335,61 @@ class ReleaseInfo:
                 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)
+                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 {self.release_branch} --body \"{body}\" --assignee {actor}"
+                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)
+                Shell.check(cmd_create_pr, strict=True, dry_run=dry_run, verbose=True)
                 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(
+                        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 = GHActions.get_pr_url_by_branch(
-                        repo=GITHUB_REPOSITORY, branch=branch_upd_version_contributors
+                    self.version_bump_pr = GH.get_pr_url_by_branch(
+                        branch=branch_upd_version_contributors
                     )
 
+    def get_change_log_branch(self):
+        return f"auto/{self.release_tag}"
+
     def update_release_info(self, dry_run: bool) -> "ReleaseInfo":
         if self.release_branch != "master":
-            branch = f"auto/{release_info.release_tag}"
-            if not dry_run:
-                url = GHActions.get_pr_url_by_branch(
-                    repo=GITHUB_REPOSITORY, branch=branch
-                )
-            else:
-                url = "dry-run"
-            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"
+            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
+
+            if not self.version_bump_pr:
+                branch = self.get_version_bump_branch()
+                if not dry_run:
+                    url = GH.get_pr_url_by_branch(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}]")
+
+            self.docker = 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 = os.getenv("GITHUB_REPOSITORY")
+        repo = CI.Envs.GITHUB_REPOSITORY
         assert repo
         cmds = [
             f"gh release create --repo {repo} --title 'Release {self.release_tag}' {self.release_tag}"
@@ -358,14 +398,48 @@ class ReleaseInfo:
             cmds.append(f"gh release upload {self.release_tag} {file}")
         if not dry_run:
             for cmd in cmds:
-                Shell.run(cmd, check=True)
-            self.release_url = f"https://github.com/{GITHUB_REPOSITORY}/releases/tag/{self.release_tag}"
+                Shell.check(cmd, strict=True, verbose=True)
+            self.release_url = (
+                f"https://github.com/{repo}/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
+        assert self.version_bump_pr
+        if dry_run:
+            version_bump_pr_num = 12345
+        else:
+            version_bump_pr_num = int(self.version_bump_pr.split("/")[-1])
+        print("Merging Version bump PR")
+        res_1 = Shell.check(
+            f"gh pr merge {version_bump_pr_num} --repo {repo} --merge --auto",
+            verbose=True,
+            dry_run=dry_run,
+        )
+
+        res_2 = True
+        if not self.release_tag.endswith("-new"):
+            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_2 = Shell.check(
+                f"gh pr merge {changelog_pr_num} --repo {repo} --merge --auto",
+                verbose=True,
+                dry_run=dry_run,
+            )
+        else:
+            assert not self.changelog_pr
+
+        self.prs_merged = res_1 and res_2
+
 
 class RepoTypes:
     RPM = "rpm"
@@ -424,7 +498,7 @@ class PackageDownloader:
         self.macos_package_files = ["clickhouse-macos", "clickhouse-macos-aarch64"]
         self.file_to_type = {}
 
-        Shell.run(f"mkdir -p {self.LOCAL_DIR}")
+        Shell.check(f"mkdir -p {self.LOCAL_DIR}")
 
         for package_type in self.PACKAGE_TYPES:
             for package in self.package_names:
@@ -474,7 +548,7 @@ class PackageDownloader:
         return res
 
     def run(self):
-        Shell.run(f"rm -rf {self.LOCAL_DIR}/*")
+        Shell.check(f"rm -rf {self.LOCAL_DIR}/*")
         for package_file in (
             self.deb_package_files + self.rpm_package_files + self.tgz_package_files
         ):
@@ -488,7 +562,7 @@ class PackageDownloader:
                 ]
             )
             self.s3.download_file(
-                bucket=S3_BUILDS_BUCKET,
+                bucket=CI.Envs.S3_BUILDS_BUCKET,
                 s3_path=s3_path,
                 local_file_path="/".join([self.LOCAL_DIR, package_file]),
             )
@@ -509,7 +583,7 @@ class PackageDownloader:
                 ]
             )
             self.s3.download_file(
-                bucket=S3_BUILDS_BUCKET,
+                bucket=CI.Envs.S3_BUILDS_BUCKET,
                 s3_path=s3_path,
                 local_file_path="/".join([self.LOCAL_DIR, destination_binary_name]),
             )
@@ -549,33 +623,33 @@ class PackageDownloader:
 
 @contextmanager
 def checkout(ref: str) -> Iterator[None]:
-    orig_ref = Shell.run(f"{GIT_PREFIX} symbolic-ref --short HEAD", check=True)
+    orig_ref = Shell.get_output_or_raise(f"{GIT_PREFIX} symbolic-ref --short HEAD")
     rollback_cmd = f"{GIT_PREFIX} checkout {orig_ref}"
     assert orig_ref
     if ref not in (orig_ref,):
-        Shell.run(f"{GIT_PREFIX} checkout {ref}")
+        Shell.check(f"{GIT_PREFIX} checkout {ref}", strict=True, verbose=True)
     try:
         yield
     except (Exception, KeyboardInterrupt) as e:
         print(f"ERROR: Exception [{e}]")
-        Shell.run(rollback_cmd)
+        Shell.check(rollback_cmd, verbose=True)
         raise
-    Shell.run(rollback_cmd)
+    Shell.check(rollback_cmd, verbose=True)
 
 
 @contextmanager
 def checkout_new(ref: str) -> Iterator[None]:
-    orig_ref = Shell.run(f"{GIT_PREFIX} symbolic-ref --short HEAD", check=True)
+    orig_ref = Shell.get_output_or_raise(f"{GIT_PREFIX} symbolic-ref --short HEAD")
     rollback_cmd = f"{GIT_PREFIX} checkout {orig_ref}"
     assert orig_ref
-    Shell.run(f"{GIT_PREFIX} checkout -b {ref}", check=True)
+    Shell.check(f"{GIT_PREFIX} checkout -b {ref}", strict=True, verbose=True)
     try:
         yield
     except (Exception, KeyboardInterrupt) as e:
         print(f"ERROR: Exception [{e}]")
-        Shell.run(rollback_cmd)
+        Shell.check(rollback_cmd, verbose=True)
         raise
-    Shell.run(rollback_cmd)
+    Shell.check(rollback_cmd, verbose=True)
 
 
 def parse_args() -> argparse.Namespace:
@@ -588,6 +662,11 @@ 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",
@@ -613,6 +692,11 @@ 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",
@@ -672,7 +756,11 @@ 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)
+            release_info.prepare(
+                commit_ref=args.ref,
+                release_type=args.release_type,
+                skip_tag_check=args.skip_tag_check,
+            )
 
     if args.download_packages:
         with ReleaseContextManager(
@@ -718,13 +806,12 @@ 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_description == ReleaseProgressDescription.OK
+            release_info.progress_status == ReleaseProgressDescription.OK
             and release_info.release_progress == ReleaseProgress.COMPLETED
         ):
             title = "Completed: " + title
@@ -740,18 +827,25 @@ if __name__ == "__main__":
     if args.set_progress_started:
         ri = ReleaseInfo.from_file()
         ri.release_progress = args.progress
-        ri.progress_description = ReleaseProgressDescription.FAILED
+        ri.progress_status = 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_description == ReleaseProgressDescription.FAILED
+            ri.progress_status == ReleaseProgressDescription.FAILED
         ), "Must be FAILED before set to OK"
-        ri.progress_description = ReleaseProgressDescription.OK
+        ri.progress_status = 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_helper.py b/tests/ci/docker_images_helper.py
index e6869852c4e..f0323145cfa 100644
--- a/tests/ci/docker_images_helper.py
+++ b/tests/ci/docker_images_helper.py
@@ -19,11 +19,11 @@ def docker_login(relogin: bool = True) -> None:
     if relogin or not Shell.check(
         "docker system info | grep --quiet -E 'Username|Registry'"
     ):
-        Shell.run(  # pylint: disable=unexpected-keyword-arg
+        Shell.check(  # pylint: disable=unexpected-keyword-arg
             "docker login --username 'robotclickhouse' --password-stdin",
-            input=get_parameter_from_ssm("dockerhub_robot_password"),
+            strict=True,
+            stdin_str=get_parameter_from_ssm("dockerhub_robot_password"),
             encoding="utf-8",
-            check=True,
         )
 
 
@@ -42,7 +42,7 @@ class DockerImage:
 def pull_image(image: DockerImage) -> DockerImage:
     try:
         logging.info("Pulling image %s - start", image)
-        Shell.run(f"docker pull {image}", check=True)
+        Shell.check(f"docker pull {image}", strict=True)
         logging.info("Pulling image %s - done", image)
     except Exception as ex:
         logging.info("Got exception pulling docker %s", ex)
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index 3e782c079c6..3251ec5644e 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -27,7 +27,6 @@ from stopwatch import Stopwatch
 from tee_popen import TeePopen
 from version_helper import (
     ClickHouseVersion,
-    get_tagged_versions,
     get_version_from_repo,
     version_arg,
 )
@@ -69,13 +68,14 @@ def parse_args() -> argparse.Namespace:
         help="sha of the commit to use packages from",
     )
     parser.add_argument(
-        "--release-type",
+        "--tag-type",
         type=str,
-        choices=("auto", "latest", "major", "minor", "patch", "head"),
+        choices=("head", "release", "latest-release"),
         default="head",
-        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",
+        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) ",
     )
     parser.add_argument(
         "--image-path",
@@ -149,74 +149,35 @@ def retry_popen(cmd: str, log_file: Path) -> int:
     return retcode
 
 
-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]:
+def gen_tags(version: ClickHouseVersion, tag_type: str) -> List[str]:
     """
-    22.2.2.2 + latest:
+    @tag_type release-latest, @version 22.2.2.2:
     - latest
     - 22
     - 22.2
     - 22.2.2
     - 22.2.2.2
-    22.2.2.2 + major:
+    @tag_type release, @version 22.2.2.2:
     - 22
     - 22.2
     - 22.2.2
     - 22.2.2.2
-    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:
+    @tag_type head:
     - head
     """
     parts = version.string.split(".")
     tags = []
-    if release_type == "latest":
-        tags.append(release_type)
+    if tag_type == "release-latest":
+        tags.append("latest")
         for i in range(len(parts)):
             tags.append(".".join(parts[: i + 1]))
-    elif release_type == "major":
+    elif tag_type == "head":
+        tags.append(tag_type)
+    elif tag_type == "release":
         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:
-        raise ValueError(f"{release_type} is not valid release part")
+        assert False, f"Invalid release type [{tag_type}]"
     return tags
 
 
@@ -370,8 +331,7 @@ def main():
         push = True
 
     image = DockerImageData(image_path, image_repo, False)
-    args.release_type = auto_release_type(args.version, args.release_type)
-    tags = gen_tags(args.version, args.release_type)
+    tags = gen_tags(args.version, args.tag_type)
     repo_urls = {}
     direct_urls: Dict[str, List[str]] = {}
 
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index 66db082677f..52970404d2d 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -166,6 +166,7 @@ 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]]:
@@ -192,6 +193,9 @@ 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 += " (but script exited with an error)"
 
     try:
         results_path = result_directory / "test_results.tsv"
@@ -339,7 +343,7 @@ def main():
         ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
 
         state, description, test_results, additional_logs = process_results(
-            result_path, server_log_path
+            retcode, result_path, server_log_path
         )
     else:
         print(
diff --git a/tests/ci/release.py b/tests/ci/release.py
index 2de20d00a00..b26d6205f3b 100755
--- a/tests/ci/release.py
+++ b/tests/ci/release.py
@@ -689,4 +689,5 @@ 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 f50ed4c1f85..3f0fc596824 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -293,9 +293,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 = ""
-    # checkname to set in commit status, set if differs from jjob name
+    # check_name to be set in commit status, set it if it differs from the job name
     check_name: str = ""
     # directory with artifacts to upload on s3
     build_dir_for_upload: Union[Path, str] = ""
@@ -667,11 +667,7 @@ ColorTheme = Tuple[str, str, str]
 def _format_header(
     header: str, branch_name: str, branch_url: Optional[str] = None
 ) -> str:
-    # Following line does not lower CI->Ci and SQLancer->Sqlancer. It only
-    # capitalizes the first letter and doesn't touch the rest of the word
-    result = " ".join([w[0].upper() + w[1:] for w in header.split(" ") if w])
-    result = result.replace("Clickhouse", "ClickHouse")
-    result = result.replace("clickhouse", "ClickHouse")
+    result = header
     if "ClickHouse" not in result:
         result = f"ClickHouse {result}"
     if branch_url:
diff --git a/tests/ci/test_docker.py b/tests/ci/test_docker.py
index 662143bfd9b..58ebe4ecbb1 100644
--- a/tests/ci/test_docker.py
+++ b/tests/ci/test_docker.py
@@ -1,61 +1,19 @@
 #!/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 = (
-            ("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"]),
+            ("release-latest", ["latest", "22", "22.2", "22.2.2", "22.2.2.2"]),
+            ("release", ["22", "22.2", "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/clickhouse-test b/tests/clickhouse-test
index ea488e7c3dd..389193836bf 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -682,6 +682,7 @@ 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"
@@ -1210,6 +1211,9 @@ 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)
@@ -1247,6 +1251,11 @@ 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:
@@ -2286,7 +2295,6 @@ 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:
@@ -3272,6 +3280,12 @@ 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",
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index 7a9b579c00a..e106e3a0e6b 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -20,6 +20,7 @@
                 <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>
diff --git a/tests/fuzz/dictionaries/functions.dict b/tests/fuzz/dictionaries/functions.dict
index ec7f8017fb2..6f2a88c22fa 100644
--- a/tests/fuzz/dictionaries/functions.dict
+++ b/tests/fuzz/dictionaries/functions.dict
@@ -1588,6 +1588,7 @@
 "groupBitmapXorResample"
 "groupBitmapXorSimpleState"
 "groupBitmapXorState"
+"groupConcat"
 "groupUniqArray"
 "groupUniqArrayArgMax"
 "groupUniqArrayArgMin"
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 85146c79b1e..a149a4d60ef 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -188,6 +188,14 @@ 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_ldap.yml b/tests/integration/compose/docker_compose_ldap.yml
index 1f50b34735d..f49e00400a2 100644
--- a/tests/integration/compose/docker_compose_ldap.yml
+++ b/tests/integration/compose/docker_compose_ldap.yml
@@ -19,6 +19,7 @@ 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_rabbitmq.yml b/tests/integration/compose/docker_compose_rabbitmq.yml
index 61b21e0e3d9..94c7f0111c4 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-management-alpine
+        image: rabbitmq:3.12.6-alpine
         hostname: rabbitmq1
         expose:
             - ${RABBITMQ_PORT:-5672}
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index f4be31cc532..aa235118aed 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -1,16 +1,19 @@
 #!/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
+from helpers.cluster import run_and_check, is_port_free
 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)
@@ -111,5 +114,40 @@ 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 6bc0ece63ca..673fc07fe94 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -135,6 +135,52 @@ 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.
@@ -248,7 +294,7 @@ def check_rabbitmq_is_available(rabbitmq_id, cookie):
         ),
         stdout=subprocess.PIPE,
     )
-    p.communicate()
+    p.wait(timeout=60)
     return p.returncode == 0
 
 
@@ -716,62 +762,67 @@ class ClickHouseCluster:
                 .stop()
             )
 
+        self.port_pool = PortPoolManager()
+
     @property
     def kafka_port(self):
         if self._kafka_port:
             return self._kafka_port
-        self._kafka_port = get_free_port()
+        self._kafka_port = self.port_pool.get_port()
         return self._kafka_port
 
     @property
     def schema_registry_port(self):
         if self._schema_registry_port:
             return self._schema_registry_port
-        self._schema_registry_port = get_free_port()
+        self._schema_registry_port = self.port_pool.get_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 = get_free_port()
+        self._schema_registry_auth_port = self.port_pool.get_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 = get_free_port()
+        self._kerberized_kafka_port = self.port_pool.get_port()
         return self._kerberized_kafka_port
 
     @property
     def azurite_port(self):
         if self._azurite_port:
             return self._azurite_port
-        self._azurite_port = get_free_port()
+        self._azurite_port = self.port_pool.get_port()
         return self._azurite_port
 
     @property
     def mongo_port(self):
         if self._mongo_port:
             return self._mongo_port
-        self._mongo_port = get_free_port()
+        self._mongo_port = self.port_pool.get_port()
         return self._mongo_port
 
     @property
     def mongo_no_cred_port(self):
         if self._mongo_no_cred_port:
             return self._mongo_no_cred_port
-        self._mongo_no_cred_port = get_free_port()
+        self._mongo_no_cred_port = self.port_pool.get_port()
         return self._mongo_no_cred_port
 
     @property
     def redis_port(self):
         if self._redis_port:
             return self._redis_port
-        self._redis_port = get_free_port()
+        self._redis_port = self.port_pool.get_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}*'",
@@ -2320,7 +2371,7 @@ class ClickHouseCluster:
                 time.sleep(0.5)
         raise Exception("Cannot wait PostgreSQL Java Client container")
 
-    def wait_rabbitmq_to_start(self, timeout=30):
+    def wait_rabbitmq_to_start(self, timeout=60):
         self.print_all_docker_pieces()
         self.rabbitmq_ip = self.get_instance_ip(self.rabbitmq_host)
 
@@ -2348,7 +2399,7 @@ class ClickHouseCluster:
                 )
             rabbitmq_debuginfo(self.rabbitmq_docker_id, self.rabbitmq_cookie)
         except Exception as e:
-            logging.debug("Unable to get logs from docker.")
+            logging.debug(f"Unable to get logs from docker: {e}.")
         raise Exception("Cannot wait RabbitMQ container")
 
     def wait_nats_is_available(self, max_retries=5):
@@ -2697,11 +2748,13 @@ class ClickHouseCluster:
             images_pull_cmd = self.base_cmd + ["pull"]
             # sometimes dockerhub/proxy can be flaky
 
-            retry(
-                log_function=lambda exception: logging.info(
-                    "Got exception pulling images: %s", exception
-                ),
-            )(run_and_check)(images_pull_cmd)
+            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)
 
             if self.with_zookeeper_secure and self.base_zookeeper_cmd:
                 logging.debug("Setup ZooKeeper Secure")
@@ -2974,11 +3027,17 @@ class ClickHouseCluster:
                     "Trying to create Azurite instance by command %s",
                     " ".join(map(str, azurite_start_cmd)),
                 )
-                retry(
-                    log_function=lambda exception: logging.info(
+
+                def logging_azurite_initialization(exception, retry_number, sleep_time):
+                    logging.info(
                         f"Azurite initialization failed with error: {exception}"
-                    ),
-                )(run_and_check)(azurite_start_cmd)
+                    )
+
+                retry(
+                    log_function=logging_azurite_initialization,
+                )(
+                    run_and_check
+                )(azurite_start_cmd)
                 self.up_called = True
                 logging.info("Trying to connect to Azurite")
                 self.wait_azurite_to_start()
diff --git a/tests/integration/helpers/retry_decorator.py b/tests/integration/helpers/retry_decorator.py
index aaa040464c2..e7bafbe29c1 100644
--- a/tests/integration/helpers/retry_decorator.py
+++ b/tests/integration/helpers/retry_decorator.py
@@ -8,7 +8,7 @@ def retry(
     delay: float = 1,
     backoff: float = 1.5,
     jitter: float = 2,
-    log_function=lambda *args, **kwargs: None,
+    log_function=None,  # should take **kwargs or arguments: `retry_number`, `exception` and `sleep_time`
     retriable_expections_list: List[Type[BaseException]] = [Exception],
 ):
     def inner(func):
@@ -26,8 +26,11 @@ def retry(
                             break
                     if not should_retry or (retry == retries - 1):
                         raise e
-                    log_function(retry=retry, exception=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
 
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
new file mode 100644
index 00000000000..a4383a77ac4
--- /dev/null
+++ b/tests/integration/test_accept_invalid_certificate/configs/ssl_config_strict.xml
@@ -0,0 +1,17 @@
+<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 87229d75f90..f43e9e6140a 100644
--- a/tests/integration/test_accept_invalid_certificate/test.py
+++ b/tests/integration/test_accept_invalid_certificate/test.py
@@ -17,6 +17,19 @@ 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,
 )
 
 
@@ -90,3 +103,25 @@ 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_checking_s3_blobs_paranoid/test.py b/tests/integration/test_checking_s3_blobs_paranoid/test.py
index 1ed70e20b79..b995b4d6461 100644
--- a/tests/integration/test_checking_s3_blobs_paranoid/test.py
+++ b/tests/integration/test_checking_s3_blobs_paranoid/test.py
@@ -4,6 +4,8 @@ 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
@@ -45,6 +47,11 @@ 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")
@@ -61,6 +68,7 @@ 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
@@ -127,7 +135,9 @@ def test_upload_s3_fail_create_multi_part_upload(cluster, broken_s3, compression
 
     broken_s3.setup_at_create_multi_part_upload()
 
-    insert_query_id = f"INSERT_INTO_TABLE_FUNCTION_FAIL_CREATE_MPU_{compression}"
+    insert_query_id = randomize_query_id(
+        f"INSERT_INTO_TABLE_FUNCTION_FAIL_CREATE_MPU_{compression}"
+    )
     error = node.query_and_get_error(
         f"""
         INSERT INTO
@@ -169,7 +179,9 @@ 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 = f"INSERT_INTO_TABLE_FUNCTION_FAIL_UPLOAD_PART_{compression}"
+    insert_query_id = randomize_query_id(
+        f"INSERT_INTO_TABLE_FUNCTION_FAIL_UPLOAD_PART_{compression}"
+    )
     error = node.query_and_get_error(
         f"""
         INSERT INTO
@@ -221,7 +233,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 = f"INSERT_INTO_TABLE_{action}_RETRIED"
+    insert_query_id = randomize_query_id(f"INSERT_INTO_TABLE_{action}_RETRIED")
     node.query(
         f"""
         INSERT INTO
@@ -250,7 +262,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 = f"INSERT_INTO_TABLE_{action}_RETRIED_1"
+    insert_query_id = randomize_query_id(f"INSERT_INTO_TABLE_{action}_RETRIED_1")
     error = node.query_and_get_error(
         f"""
             INSERT INTO
@@ -285,7 +297,7 @@ def test_when_s3_broken_pipe_at_upload_is_retried(cluster, broken_s3):
         action="broken_pipe",
     )
 
-    insert_query_id = f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD"
+    insert_query_id = randomize_query_id(f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD")
     node.query(
         f"""
         INSERT INTO
@@ -319,7 +331,7 @@ def test_when_s3_broken_pipe_at_upload_is_retried(cluster, broken_s3):
         after=2,
         action="broken_pipe",
     )
-    insert_query_id = f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD_1"
+    insert_query_id = randomize_query_id(f"TEST_WHEN_S3_BROKEN_PIPE_AT_UPLOAD_1")
     error = node.query_and_get_error(
         f"""
                INSERT INTO
@@ -361,7 +373,7 @@ def test_when_s3_connection_reset_by_peer_at_upload_is_retried(
         action_args=["1"] if send_something else ["0"],
     )
 
-    insert_query_id = (
+    insert_query_id = randomize_query_id(
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_UPLOAD_{send_something}"
     )
     node.query(
@@ -398,7 +410,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 = (
+    insert_query_id = randomize_query_id(
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_UPLOAD_{send_something}_1"
     )
     error = node.query_and_get_error(
@@ -443,7 +455,7 @@ def test_when_s3_connection_reset_by_peer_at_create_mpu_retried(
         action_args=["1"] if send_something else ["0"],
     )
 
-    insert_query_id = (
+    insert_query_id = randomize_query_id(
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_MULTIPARTUPLOAD_{send_something}"
     )
     node.query(
@@ -481,7 +493,7 @@ def test_when_s3_connection_reset_by_peer_at_create_mpu_retried(
         action_args=["1"] if send_something else ["0"],
     )
 
-    insert_query_id = (
+    insert_query_id = randomize_query_id(
         f"TEST_WHEN_S3_CONNECTION_RESET_BY_PEER_AT_MULTIPARTUPLOAD_{send_something}_1"
     )
     error = node.query_and_get_error(
@@ -521,7 +533,7 @@ def test_query_is_canceled_with_inf_retries(cluster, broken_s3):
         action="connection_refused",
     )
 
-    insert_query_id = f"TEST_QUERY_IS_CANCELED_WITH_INF_RETRIES"
+    insert_query_id = randomize_query_id(f"TEST_QUERY_IS_CANCELED_WITH_INF_RETRIES")
     request = node.get_query_request(
         f"""
         INSERT INTO
@@ -579,7 +591,7 @@ def test_adaptive_timeouts(cluster, broken_s3, node_name):
         count=1000000,
     )
 
-    insert_query_id = f"TEST_ADAPTIVE_TIMEOUTS_{node_name}"
+    insert_query_id = randomize_query_id(f"TEST_ADAPTIVE_TIMEOUTS_{node_name}")
     node.query(
         f"""
             INSERT INTO
@@ -631,6 +643,7 @@ 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()
@@ -689,3 +702,15 @@ 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 = 'S3DiskNoKeyErrors'
+            """
+        ).strip()
+    )
+
+    assert s3_disk_no_key_errors_metric_value > 0
diff --git a/tests/integration/test_replicated_table_attach/configs/config.xml b/tests/integration/test_replicated_table_attach/configs/config.xml
index fea3eab4126..3f72f638776 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>5</initialization_retry_period>
+        <initialization_retry_period>3</initialization_retry_period>
     </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_replicated_table_attach/test.py b/tests/integration/test_replicated_table_attach/test.py
index de60b7ec291..4fe8064b26a 100644
--- a/tests/integration/test_replicated_table_attach/test.py
+++ b/tests/integration/test_replicated_table_attach/test.py
@@ -80,4 +80,8 @@ def test_startup_with_small_bg_pool_partitioned(started_cluster):
         assert_values()
 
     # check that we activate it in the end
-    node.query_with_retry("INSERT INTO replicated_table_partitioned VALUES(20, 30)")
+    node.query_with_retry(
+        "INSERT INTO replicated_table_partitioned VALUES(20, 30)",
+        retry_count=20,
+        sleep_time=3,
+    )
diff --git a/tests/integration/test_replicated_user_defined_functions/test.py b/tests/integration/test_replicated_user_defined_functions/test.py
index e5f6683b90b..92d86a8fd2c 100644
--- a/tests/integration/test_replicated_user_defined_functions/test.py
+++ b/tests/integration/test_replicated_user_defined_functions/test.py
@@ -141,6 +141,9 @@ def test_drop_if_exists():
 
 def test_replication():
     node1.query("CREATE FUNCTION f2 AS (x, y) -> x - y")
+    node1.query(
+        "CREATE FUNCTION f3 AS () -> (SELECT sum(s) FROM (SELECT 1 as s UNION ALL SELECT 1 as s))"
+    )
 
     assert (
         node1.query("SELECT create_query FROM system.functions WHERE name='f2'")
@@ -154,7 +157,11 @@ def test_replication():
     assert node1.query("SELECT f2(12,3)") == "9\n"
     assert node2.query("SELECT f2(12,3)") == "9\n"
 
+    assert node1.query("SELECT f3()") == "2\n"
+    assert node2.query("SELECT f3()") == "2\n"
+
     node1.query("DROP FUNCTION f2")
+    node1.query("DROP FUNCTION f3")
     assert (
         node1.query("SELECT create_query FROM system.functions WHERE name='f2'") == ""
     )
@@ -214,7 +221,9 @@ def test_reload_zookeeper():
     )
 
     # config reloads, but can still work
-    node1.query("CREATE FUNCTION f2 AS (x, y) -> x - y")
+    node1.query(
+        "CREATE FUNCTION f2 AS () -> (SELECT sum(s) FROM (SELECT 1 as s UNION ALL SELECT 1 as s))"
+    )
     assert_eq_with_retry(
         node2,
         "SELECT name FROM system.functions WHERE name IN ['f1', 'f2'] ORDER BY name",
@@ -269,7 +278,7 @@ def test_reload_zookeeper():
         TSV(["f1", "f2", "f3"]),
     )
 
-    assert node2.query("SELECT f1(12, 3), f2(12, 3), f3(12, 3)") == TSV([[15, 9, 4]])
+    assert node2.query("SELECT f1(12, 3), f2(), f3(12, 3)") == TSV([[15, 2, 4]])
 
     active_zk_connections = get_active_zk_connections()
     assert (
@@ -307,3 +316,13 @@ def test_start_without_zookeeper():
         "CREATE FUNCTION f1 AS (x, y) -> (x + y)\n",
     )
     node1.query("DROP FUNCTION f1")
+
+
+def test_server_restart():
+    node1.query(
+        "CREATE FUNCTION f1 AS () -> (SELECT sum(s) FROM (SELECT 1 as s UNION ALL SELECT 1 as s))"
+    )
+    assert node1.query("SELECT f1()") == "2\n"
+    node1.restart_clickhouse()
+    assert node1.query("SELECT f1()") == "2\n"
+    node1.query("DROP FUNCTION f1")
diff --git a/tests/integration/test_s3_plain_rewritable/test.py b/tests/integration/test_s3_plain_rewritable/test.py
index 4b1aaafc814..020e170eb48 100644
--- a/tests/integration/test_s3_plain_rewritable/test.py
+++ b/tests/integration/test_s3_plain_rewritable/test.py
@@ -139,6 +139,19 @@ 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_storage_delta/test.py b/tests/integration/test_storage_delta/test.py
index d3dd7cfe52a..054b79ff6fe 100644
--- a/tests/integration/test_storage_delta/test.py
+++ b/tests/integration/test_storage_delta/test.py
@@ -8,6 +8,8 @@ import os
 import json
 import time
 import glob
+import random
+import string
 
 import pyspark
 import delta
@@ -52,6 +54,11 @@ 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:
@@ -151,7 +158,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 = "test_single_log_file"
+    TABLE_NAME = randomize_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(
@@ -175,7 +182,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 = "test_partition_by"
+    TABLE_NAME = randomize_table_name("test_partition_by")
 
     write_delta_from_df(
         spark,
@@ -197,7 +204,7 @@ def test_checkpoint(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = "test_checkpoint"
+    TABLE_NAME = randomize_table_name("test_checkpoint")
 
     write_delta_from_df(
         spark,
@@ -272,7 +279,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 = "test_multiple_log_files"
+    TABLE_NAME = randomize_table_name("test_multiple_log_files")
 
     write_delta_from_df(
         spark, generate_data(spark, 0, 100), f"/{TABLE_NAME}", mode="overwrite"
@@ -310,7 +317,7 @@ def test_metadata(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = started_cluster.minio_bucket
-    TABLE_NAME = "test_metadata"
+    TABLE_NAME = randomize_table_name("test_metadata")
 
     parquet_data_path = create_initial_data_file(
         started_cluster,
@@ -339,9 +346,9 @@ def test_metadata(started_cluster):
 
 
 def test_types(started_cluster):
-    TABLE_NAME = "test_types"
+    TABLE_NAME = randomize_table_name("test_types")
     spark = started_cluster.spark_session
-    result_file = f"{TABLE_NAME}_result_2"
+    result_file = randomize_table_name(f"{TABLE_NAME}_result_2")
 
     delta_table = (
         DeltaTable.create(spark)
@@ -415,7 +422,7 @@ def test_restart_broken(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = "broken"
-    TABLE_NAME = "test_restart_broken"
+    TABLE_NAME = randomize_table_name("test_restart_broken")
 
     if not minio_client.bucket_exists(bucket):
         minio_client.make_bucket(bucket)
@@ -452,6 +459,18 @@ 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 = 'S3DiskNoKeyErrors'
+            """
+        ).strip()
+    )
+
+    assert s3_disk_no_key_errors_metric_value == 0
+
     minio_client.make_bucket(bucket)
 
     upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
@@ -464,7 +483,7 @@ def test_restart_broken_table_function(started_cluster):
     spark = started_cluster.spark_session
     minio_client = started_cluster.minio_client
     bucket = "broken2"
-    TABLE_NAME = "test_restart_broken_table_function"
+    TABLE_NAME = randomize_table_name("test_restart_broken_table_function")
 
     if not minio_client.bucket_exists(bucket):
         minio_client.make_bucket(bucket)
@@ -518,7 +537,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 = "test_partition_columns"
+    TABLE_NAME = randomize_table_name("test_partition_columns")
     result_file = f"{TABLE_NAME}"
     partition_columns = ["b", "c", "d", "e"]
 
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 47d8f44c0b7..ccd2c7eaf11 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -157,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')"
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index 8393e88db88..37457e00701 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -4771,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_, num_messages_read, stable_timestamp(last_commit_time) as last_commit_time_,
+          stable_timestamp(last_poll_time) as last_poll_time_, 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;
@@ -4791,7 +4791,6 @@ 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
@@ -4810,7 +4809,6 @@ 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
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index 3957afe8b29..6e2d15b03be 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -1,4 +1,5 @@
 import pymongo
+from uuid import UUID
 
 import pytest
 from helpers.client import QueryRuntimeException
@@ -72,6 +73,28 @@ 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)
@@ -140,6 +163,10 @@ 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],
@@ -174,6 +201,7 @@ 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),"
@@ -222,6 +250,11 @@ 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"
@@ -377,6 +410,7 @@ 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', '', '')"
     )
@@ -406,10 +440,13 @@ 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_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index 9a97e8c23d1..92d6f181464 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -1333,16 +1333,7 @@ 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}"))
 
-    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:
+    def print_debug_info():
         processed_files = (
             node.query(
                 f"""
@@ -1369,7 +1360,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}/{files_to_generate}")
+        logging.debug(f"Processed rows: {count}/{total_rows}")
 
         info = node.query(
             f"""
@@ -1406,6 +1397,18 @@ 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}"
@@ -1414,6 +1417,12 @@ 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
diff --git a/tests/integration/test_system_flush_logs/test.py b/tests/integration/test_system_flush_logs/test.py
index 2022f9d4a89..713b327eb76 100644
--- a/tests/integration/test_system_flush_logs/test.py
+++ b/tests/integration/test_system_flush_logs/test.py
@@ -13,9 +13,8 @@ node = cluster.add_instance(
 )
 
 system_logs = [
-    # disabled by default
-    ("system.text_log", 0),
     # enabled by default
+    ("system.text_log", 1),
     ("system.query_log", 1),
     ("system.query_thread_log", 1),
     ("system.part_log", 1),
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 5a087d03266..107864fde0c 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>10M</max_size>
-                <max_file_segment_size>1M</max_file_segment_size>
-                <boundary_alignment>1M</boundary_alignment>
+                <max_size>12M</max_size>
+                <max_file_segment_size>100K</max_file_segment_size>
+                <boundary_alignment>100K</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 cab134dcce2..87192a20975 100644
--- a/tests/integration/test_temporary_data_in_cache/test.py
+++ b/tests/integration/test_temporary_data_in_cache/test.py
@@ -7,6 +7,9 @@ import fnmatch
 from helpers.cluster import ClickHouseCluster
 from helpers.client import QueryRuntimeException
 
+
+MB = 1024 * 1024
+
 cluster = ClickHouseCluster(__file__)
 
 node = cluster.add_instance(
@@ -36,15 +39,30 @@ def test_cache_evicted_by_temporary_data(start_cluster):
         q("SELECT sum(size) FROM system.filesystem_cache").strip()
     )
 
-    assert get_cache_size() == 0
+    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_free_space() > 8 * 1024 * 1024
+    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()
 
     # Codec is NONE to make cache size predictable
     q(
-        "CREATE TABLE t1 (x UInt64 CODEC(NONE), y UInt64 CODEC(NONE)) ENGINE = MergeTree ORDER BY x SETTINGS storage_policy = 'tiny_local_cache'"
+        "CREATE TABLE t1 (x UInt64 CODEC(NONE)) ENGINE = MergeTree ORDER BY x SETTINGS storage_policy = 'tiny_local_cache'"
     )
-    q("INSERT INTO t1 SELECT number, number FROM numbers(1024 * 1024)")
+    q("INSERT INTO t1 SELECT 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")
@@ -54,11 +72,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 * 1024 * 1024
+    assert cache_size_with_t1 > 8 * MB, dump_debug_info()
 
     # Almost all disk space is occupied by t1 cache
     free_space_with_t1 = get_free_space()
-    assert free_space_with_t1 < 4 * 1024 * 1024
+    assert free_space_with_t1 < 4 * MB, dump_debug_info()
 
     # Try to sort the table, but fail because of lack of disk space
     with pytest.raises(QueryRuntimeException) as exc:
@@ -76,31 +94,27 @@ 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
+    assert cache_size_after_eviction < cache_size_with_t1, dump_debug_info()
 
     # Disk space freed, at least 3 MB, because temporary data tried to write 4 MB
-    assert get_free_space() > free_space_with_t1 + 3 * 1024 * 1024
+    assert get_free_space() > free_space_with_t1 + 3 * MB, dump_debug_info()
 
     # Read some data to fill the cache again
-    q("SELECT avg(y) FROM t1")
+    q("SELECT avg(x) FROM t1")
 
     cache_size_with_t1 = get_cache_size()
-    assert cache_size_with_t1 > 8 * 1024 * 1024, q(
-        "SELECT * FROM system.filesystem_cache FORMAT Vertical"
-    )
+    assert cache_size_with_t1 > 8 * MB, dump_debug_info()
 
     # Almost all disk space is occupied by t1 cache
     free_space_with_t1 = get_free_space()
-    assert free_space_with_t1 < 4 * 1024 * 1024, q(
-        "SELECT * FROM system.disks WHERE name = 'tiny_local_cache_local_disk' FORMAT Vertical"
-    )
+    assert free_space_with_t1 < 4 * MB, dump_debug_info()
 
     node.http_query(
         "SELECT randomPrintableASCII(1024) FROM numbers(8 * 1024) FORMAT TSV",
         params={"buffer_size": 0, "wait_end_of_query": 1},
     )
 
-    assert get_free_space() > free_space_with_t1 + 3 * 1024 * 1024
+    assert get_free_space() > free_space_with_t1 + 3 * MB, dump_debug_info()
 
     # not enough space for buffering 32 MB
     with pytest.raises(Exception) as exc:
@@ -112,4 +126,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")
+    q("DROP TABLE IF EXISTS t1 SYNC")
diff --git a/tests/integration/test_ttl_move/test.py b/tests/integration/test_ttl_move/test.py
index 3b79ea7916d..925bdf9baaa 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):
+def check_used_disks_with_retry(node, table_name, expected_disks, retries=1):
     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 10 SECOND DELETE
+                d1 + INTERVAL 30 SECOND DELETE
         """.format(
                 name=name
             )
@@ -1635,11 +1635,19 @@ 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"]), 100)
+            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"
+            )
         else:
-            assert check_used_disks_with_retry(node1, name, set(["jbod1", "jbod2"]), 50)
+            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"
+            )
 
-        time.sleep(5)
+        time.sleep(25)
 
         optimize_table(20)
 
diff --git a/tests/integration/test_user_defined_object_persistence/test.py b/tests/integration/test_user_defined_object_persistence/test.py
index 986438a4eed..bd491dfa195 100644
--- a/tests/integration/test_user_defined_object_persistence/test.py
+++ b/tests/integration/test_user_defined_object_persistence/test.py
@@ -18,20 +18,25 @@ def started_cluster():
 def test_persistence():
     create_function_query1 = "CREATE FUNCTION MySum1 AS (a, b) -> a + b"
     create_function_query2 = "CREATE FUNCTION MySum2 AS (a, b) -> MySum1(a, b) + b"
+    create_function_query3 = "CREATE FUNCTION MyUnion AS () -> (SELECT sum(s) FROM (SELECT 1 as s UNION ALL SELECT 1 as s))"
 
     instance.query(create_function_query1)
     instance.query(create_function_query2)
+    instance.query(create_function_query3)
 
     assert instance.query("SELECT MySum1(1,2)") == "3\n"
     assert instance.query("SELECT MySum2(1,2)") == "5\n"
+    assert instance.query("SELECT MyUnion()") == "2\n"
 
     instance.restart_clickhouse()
 
     assert instance.query("SELECT MySum1(1,2)") == "3\n"
     assert instance.query("SELECT MySum2(1,2)") == "5\n"
+    assert instance.query("SELECT MyUnion()") == "2\n"
 
     instance.query("DROP FUNCTION MySum2")
     instance.query("DROP FUNCTION MySum1")
+    instance.query("DROP FUNCTION MyUnion")
 
     instance.restart_clickhouse()
 
@@ -48,3 +53,10 @@ def test_persistence():
         or "Function with name 'MySum2' does not exist. In scope SELECT MySum2(1, 2)"
         in error_message
     )
+
+    error_message = instance.query_and_get_error("SELECT MyUnion()")
+    assert (
+        "Unknown function MyUnion" in error_message
+        or "Function with name 'MyUnion' does not exist. In scope SELECT MyUnion"
+        in error_message
+    )
diff --git a/tests/performance/array_reduce.xml b/tests/performance/array_reduce.xml
index 8e271c155f3..0f50eba43bf 100644
--- a/tests/performance/array_reduce.xml
+++ b/tests/performance/array_reduce.xml
@@ -1,11 +1,8 @@
 <test>
-
-
-
-    <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>
+    <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>
 </test>
diff --git a/tests/performance/final_big_column.xml b/tests/performance/final_big_column.xml
index 5225b3d7ad4..bc7c3570db6 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(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>
+    <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>
 
     <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/read_from_comp_parts.xml b/tests/performance/read_from_comp_parts.xml
index a625075588a..055df51d12d 100644
--- a/tests/performance/read_from_comp_parts.xml
+++ b/tests/performance/read_from_comp_parts.xml
@@ -5,15 +5,16 @@
         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, 30, 30)
+        FROM generateRandom('c1 UInt32, c2 UInt64, s1 String, arr1 Array(UInt32), c3 UInt64, s2 String', 0, 5, 6)
         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(c1)</query>
+    <query short="1">SELECT count() FROM mt_comp_parts WHERE NOT ignore(s1)</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 cb56ab6c5bf..da7bbf77a28 100755
--- a/tests/performance/scripts/compare.sh
+++ b/tests/performance/scripts/compare.sh
@@ -71,6 +71,8 @@ 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/entrypoint.sh b/tests/performance/scripts/entrypoint.sh
index 0c3bfa550f4..db7d96ad150 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 "$base" pr -- tests/performance/*.xml | tee changed-test-definitions.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 :!docker/test/performance-comparison | tee other-changed-files.txt
 fi
 
diff --git a/tests/performance/scripts/perf.py b/tests/performance/scripts/perf.py
index e98c158249a..83d66997677 100755
--- a/tests/performance/scripts/perf.py
+++ b/tests/performance/scripts/perf.py
@@ -345,6 +345,16 @@ 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/views_max_insert_threads.xml b/tests/performance/views_max_insert_threads.xml
deleted file mode 100644
index 2988984f5d8..00000000000
--- a/tests/performance/views_max_insert_threads.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- https://github.com/ClickHouse/ClickHouse/issues/37900 -->
-<test>
-    <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>
-
-    <query>insert into views_max_insert_threads_null select * from numbers_mt(3000000000) settings max_threads = 16, max_insert_threads=16</query>
-
-    <drop_query>drop table if exists views_max_insert_threads_null</drop_query>
-    <drop_query>drop table if exists views_max_insert_threads_mv</drop_query>
-</test>
-
diff --git a/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.sql b/tests/queries/0_stateless/00002_log_and_exception_messages_formatting.sql
index 07c42d6d039..b806aff3a00 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,4 +1,4 @@
--- Tags: no-parallel, no-fasttest, no-ubsan, no-batch
+-- Tags: no-parallel, no-fasttest, no-ubsan, no-batch, no-flaky-check
 -- no-parallel because we want to run this test when most of the other tests already passed
 
 -- If this test fails, see the "Top patterns of log messages" diagnostics in the end of run.log
@@ -163,7 +163,10 @@ 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/00257_shard_no_aggregates_and_constant_keys.reference b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
index 63b8a9d14fc..fc77ed8a241 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
@@ -8,13 +8,13 @@
 40
 41
 
-0
+41
 2	42
 
 2	42
 43
 
-0
+43
 11
 
 11
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 045de9ee7ee..38b108a696f 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison.python
@@ -2,23 +2,16 @@
 
 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"))
 
-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()
-    )
+from pure_http_client import ClickHouseClient
+
+client = ClickHouseClient()
 
 
 def check_answers(query, answer):
-    ch_answer = get_ch_answer(query)
+    ch_answer = client.query(query)
     if ch_answer.strip() != answer.strip():
         print("FAIL on query:", query)
         print("Expected answer:", answer)
diff --git a/tests/queries/0_stateless/00927_disable_hyperscan.sql b/tests/queries/0_stateless/00927_disable_hyperscan.sql
index c07848a4fcc..24ec7a35adb 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-debug
+-- Tags: no-fasttest
 
 SET allow_hyperscan = 1;
 
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 03dd376f802..453e1bb8f0a 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
@@ -8,6 +8,18 @@ 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
 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());
@@ -19,7 +31,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'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table' DB '${CLICKHOUSE_DATABASE}' UPDATE_FIELD 'insert_time' UPDATE_LAG 60))
 LAYOUT(FLAT())
 LIFETIME(1);
 EOF
@@ -29,11 +41,10 @@ $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)"
 
-# Wait when the dictionary will update the value for 13 on its own:
-while [ "$(${CLICKHOUSE_CLIENT} --query "SELECT dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))")" = -1 ]
-do
-    sleep 0.5
-done
+if ! wait_for_dict_upate; then
+    echo "Dictionary had not been reloaded" >&2
+    exit 1
+fi
 
 $CLICKHOUSE_CLIENT --query "SELECT '13 -> ', dictGetInt64('${CLICKHOUSE_DATABASE}.dict', 'y', toUInt64(13))"
 
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 d6cc3ee1a88..3c85ff30ba8 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,5 +1,4 @@
 #!/usr/bin/env python3
-# Tags: no-parallel
 
 import os
 import sys
@@ -17,6 +16,7 @@ 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)
 
@@ -31,40 +31,38 @@ with client(name="client1>", log=log) as client1, client(
     client2.send("SET allow_experimental_analyzer = 0")
     client2.expect(prompt)
 
-    client1.send("CREATE DATABASE IF NOT EXISTS 01062_window_view_event_hop_watch_asc")
+    client1.send(f"DROP TABLE IF EXISTS {database_name}.mt")
     client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.mt")
-    client1.expect(prompt)
-    client1.send("DROP TABLE IF EXISTS 01062_window_view_event_hop_watch_asc.wv SYNC")
+    client1.send(f"DROP TABLE IF EXISTS {database_name}.wv SYNC")
     client1.expect(prompt)
 
     client1.send(
-        "CREATE TABLE 01062_window_view_event_hop_watch_asc.mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple()"
+        f"CREATE TABLE {database_name}.mt(a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple()"
     )
     client1.expect(prompt)
     client1.send(
-        "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"
+        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"
     )
     client1.expect(prompt)
 
-    client1.send("WATCH 01062_window_view_event_hop_watch_asc.wv")
+    client1.send(f"WATCH {database_name}.wv")
     client1.expect("Query id" + end_of_block)
     client1.expect("Progress: 0.00 rows.*\\)")
     client2.send(
-        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));"
+        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client2.send(
-        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));"
+        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client1.expect("1*" + end_of_block)
     client2.send(
-        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));"
+        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client2.send(
-        "INSERT INTO 01062_window_view_event_hop_watch_asc.mt VALUES (1, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));"
+        f"INSERT INTO {database_name}.mt VALUES (1, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));"
     )
     client2.expect(prompt)
     client1.expect("1" + end_of_block)
@@ -77,9 +75,7 @@ with client(name="client1>", log=log) as client1, client(
     if match.groups()[1]:
         client1.send(client1.command)
         client1.expect(prompt)
-    client1.send("DROP TABLE 01062_window_view_event_hop_watch_asc.wv SYNC")
+    client1.send(f"DROP TABLE {database_name}.wv SYNC")
     client1.expect(prompt)
-    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.send(f"DROP TABLE {database_name}.mt")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01086_window_view_cleanup.sh b/tests/queries/0_stateless/01086_window_view_cleanup.sh
index 113bcffb2af..0bce08523e2 100755
--- a/tests/queries/0_stateless/01086_window_view_cleanup.sh
+++ b/tests/queries/0_stateless/01086_window_view_cleanup.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
 
 # Creation of a database with Ordinary engine emits a warning.
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
@@ -12,38 +11,40 @@ opts=(
     "--allow_experimental_analyzer=0"
 )
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --allow_deprecated_database_ordinary=1 <<EOF
-SET allow_experimental_window_view = 1;
-SET window_view_clean_interval = 1;
+DATABASE_ORDINARY="${CLICKHOUSE_DATABASE}_ordinary"
 
-DROP DATABASE IF EXISTS test_01086;
-CREATE DATABASE test_01086 ENGINE=Ordinary;
+$CLICKHOUSE_CLIENT "${opts[@]}" --allow_deprecated_database_ordinary=1 --multiquery "
+    SET allow_experimental_window_view = 1;
+    SET window_view_clean_interval = 1;
 
-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;
+    DROP DATABASE IF EXISTS ${DATABASE_ORDINARY};
+    CREATE DATABASE ${DATABASE_ORDINARY} ENGINE=Ordinary;
 
-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
+    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'));
+"
 
 while true; do
-	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "5" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM ${DATABASE_ORDINARY}.\`.inner.wv\`" | grep -q "5" && break || sleep .5 ||:
 done
 
 $CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT sleep(2);"
 
-$CLICKHOUSE_CLIENT "${opts[@]}" --query="INSERT INTO test_01086.mt VALUES (1, 6, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));"
+$CLICKHOUSE_CLIENT "${opts[@]}" --query="INSERT INTO ${DATABASE_ORDINARY}.mt VALUES (1, 6, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));"
 
 while true; do
-	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM test_01086.\`.inner.wv\`" | grep -q "3" && break || sleep .5 ||:
+	$CLICKHOUSE_CLIENT "${opts[@]}" --query="SELECT count(*) FROM ${DATABASE_ORDINARY}.\`.inner.wv\`" | grep -q "3" && break || sleep .5 ||:
 done
 
-$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;"
+$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;"
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 bcaa70abbb5..a6a99aadac2 100755
--- a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
+++ b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
@@ -1,29 +1,31 @@
 #!/usr/bin/env bash
-# Tags: no-parallel, no-fasttest
+# Tags: no-fasttest, no-parallel
+# no-parallel: FIXME: Timing issues with INSERT + DETACH (https://github.com/ClickHouse/ClickHouse/pull/67610/files#r1700345054)
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$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()"
+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 --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO test_01107.mt SELECT number + sleepEachRow(3) FROM numbers(5)" &
+$CLICKHOUSE_CLIENT --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO ${NEW_DATABASE}.mt SELECT number + sleepEachRow(3) FROM numbers(5)" &
 sleep 1
 
-$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"
+$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"
 
 wait
-$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 -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 --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO test_01107.mt SELECT number + sleepEachRow(1) FROM numbers(5)" && echo "end" &
+$CLICKHOUSE_CLIENT --function_sleep_max_microseconds_per_block 60000000 -q "INSERT INTO ${NEW_DATABASE}.mt SELECT number + sleepEachRow(1) FROM numbers(5)" && echo "end" &
 sleep 1
-$CLICKHOUSE_CLIENT -q "DROP DATABASE test_01107" --database_atomic_wait_for_drop_and_detach_synchronously=0 && sleep 1 && echo "dropped"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE ${NEW_DATABASE}" --database_atomic_wait_for_drop_and_detach_synchronously=0 && sleep 1 && echo "dropped"
 wait
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 92e6fce2c93..362da3ac364 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, no-parallel
+-- Tags: zookeeper
 
 DROP TABLE IF EXISTS r_prop_table1;
 DROP TABLE IF EXISTS r_prop_table2;
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 1cf52c0288b..8b97f3514b3 100644
--- a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
+++ b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
@@ -1,4 +1,4 @@
--- Tags: no-tsan
+-- Tags: long, no-tsan, no-distributed-cache
 -- Tag no-tsan: Too long for TSan
 
 set enable_filesystem_cache=0;
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 9b96ce3e586..b65d0a3e73a 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: no-random-merge-tree-settings, no-tsan, no-debug, no-object-storage
+-- Tags: long, no-random-merge-tree-settings, no-random-settings, no-tsan, no-debug, no-object-storage, no-distributed-cache
 -- 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
 
@@ -16,7 +16,7 @@ CREATE TABLE adaptive_table(
     value String
 ) ENGINE MergeTree()
 ORDER BY key
-SETTINGS index_granularity_bytes=1048576,
+SETTINGS index_granularity_bytes = 1048576,
 min_bytes_for_wide_part = 0,
 min_rows_for_wide_part = 0,
 enable_vertical_merge_algorithm = 0;
diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
index 471da5586b7..e336a02318d 100644
--- a/tests/queries/0_stateless/01651_map_functions.reference
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -52,3 +52,10 @@
 {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 cf2460fce2c..dc93a38b265 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -67,12 +67,20 @@ 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/01676_range_hashed_dictionary.sql b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
index 430f3a86dc1..ba2a9eba87f 100644
--- a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
@@ -1,10 +1,4 @@
--- 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
+CREATE TABLE date_table
 (
   CountryID UInt64,
   StartDate Date,
@@ -14,11 +8,11 @@ CREATE TABLE database_for_range_dict.date_table
 ENGINE = MergeTree()
 ORDER BY CountryID;
 
-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);
+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);
 
-CREATE DICTIONARY database_for_range_dict.range_dictionary
+CREATE DICTIONARY range_dictionary
 (
   CountryID UInt64,
   StartDate Date,
@@ -26,7 +20,7 @@ CREATE DICTIONARY database_for_range_dict.range_dictionary
   Tax Float64 DEFAULT 0.2
 )
 PRIMARY KEY CountryID
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB 'database_for_range_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB currentDatabase()))
 LIFETIME(MIN 1 MAX 1000)
 LAYOUT(RANGE_HASHED())
 RANGE(MIN StartDate MAX EndDate)
@@ -35,30 +29,30 @@ SETTINGS(dictionary_use_async_executor=1, max_threads=8)
 
 SELECT 'Dictionary not nullable';
 SELECT 'dictGet';
-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 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 'dictHas';
-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 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 'select columns from dictionary';
 SELECT 'allColumns';
-SELECT * FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT * FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
 SELECT 'noColumns';
-SELECT 1 FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT 1 FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumns';
-SELECT CountryID, StartDate, Tax FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT CountryID, StartDate, Tax FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumn';
-SELECT Tax FROM database_for_range_dict.range_dictionary ORDER BY CountryID, StartDate, EndDate;
+SELECT Tax FROM range_dictionary ORDER BY CountryID, StartDate, EndDate;
 
-DROP DICTIONARY database_for_range_dict.range_dictionary;
-DROP TABLE database_for_range_dict.date_table;
+DROP DICTIONARY range_dictionary;
+DROP TABLE date_table;
 
-CREATE TABLE database_for_range_dict.date_table
+CREATE TABLE date_table
 (
   CountryID UInt64,
   StartDate Date,
@@ -68,11 +62,11 @@ CREATE TABLE database_for_range_dict.date_table
 ENGINE = MergeTree()
 ORDER BY CountryID;
 
-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);
+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);
 
-CREATE DICTIONARY database_for_range_dict.range_dictionary_nullable
+CREATE DICTIONARY range_dictionary_nullable
 (
   CountryID UInt64,
   StartDate Date,
@@ -80,35 +74,33 @@ CREATE DICTIONARY database_for_range_dict.range_dictionary_nullable
   Tax Nullable(Float64) DEFAULT 0.2
 )
 PRIMARY KEY CountryID
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB 'database_for_range_dict'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'date_table' DB currentDatabase()))
 LIFETIME(MIN 1 MAX 1000)
 LAYOUT(RANGE_HASHED())
 RANGE(MIN StartDate MAX EndDate);
 
 SELECT 'Dictionary nullable';
 SELECT 'dictGet';
-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 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 'dictHas';
-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 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 'select columns from dictionary';
 SELECT 'allColumns';
-SELECT * FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT * FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 SELECT 'noColumns';
-SELECT 1 FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT 1 FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumns';
-SELECT CountryID, StartDate, Tax FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT CountryID, StartDate, Tax FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 SELECT 'onlySpecificColumn';
-SELECT Tax FROM database_for_range_dict.range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
+SELECT Tax FROM range_dictionary_nullable ORDER BY CountryID, StartDate, EndDate;
 
-DROP DICTIONARY database_for_range_dict.range_dictionary_nullable;
-DROP TABLE database_for_range_dict.date_table;
-
-DROP DATABASE database_for_range_dict;
+DROP DICTIONARY range_dictionary_nullable;
+DROP TABLE date_table;
 
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 202e32a583e..149315ad9d5 100644
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.reference
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.reference
@@ -12,5 +12,13 @@ yml
 2
 yaml
 2
-ini
-Code: 347. Unknown format of '/config_default.ini' config. (CANNOT_LOAD_CONFIG)
+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)
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 4e970f17d3a..58fd6852116 100755
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
@@ -12,7 +12,11 @@ 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
-ini_config=$CLICKHOUSE_TMP/config_$CLICKHOUSE_DATABASE.ini
+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
 
 function cleanup()
 {
@@ -22,7 +26,11 @@ function cleanup()
     rm "${conf_config:?}"
     rm "${yml_config:?}"
     rm "${yaml_config:?}"
-    rm "${ini_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:?}"
 }
 trap cleanup EXIT
 
@@ -52,10 +60,29 @@ EOL
 cat > "$yaml_config" <<EOL
 max_threads: 2
 EOL
-cat > "$ini_config" <<EOL
-[config]
-max_threads=2
+cat > "$autodetect_xml_with_leading_whitespace_config" <<EOL
+
+    <config>
+        <max_threads>2</max_threads>
+    </config>
 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')"
@@ -74,5 +101,16 @@ 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 'ini'
-$CLICKHOUSE_CLIENT --config "$ini_config" -q "select getSetting('max_threads')" 2>&1 |& sed -e "s#$CLICKHOUSE_TMP##" -e "s#DB::Exception: ##"
+
+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
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 33be11c07d5..6fabd33c804 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/02099_tsv_raw_format.sh b/tests/queries/0_stateless/02099_tsv_raw_format.sh
index 16b695e4037..a69c96ab613 100755
--- a/tests/queries/0_stateless/02099_tsv_raw_format.sh
+++ b/tests/queries/0_stateless/02099_tsv_raw_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -14,7 +15,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,13 +50,12 @@ $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 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 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/02150_index_hypothesis_race_long.sh b/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh
index 114f60cc393..5c432350768 100755
--- a/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh
+++ b/tests/queries/0_stateless/02150_index_hypothesis_race_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-random-settings, no-distributed-cache
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02231_bloom_filter_sizing.reference b/tests/queries/0_stateless/02231_bloom_filter_sizing.reference
index bdba311c092..aabadfc92fd 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
-10000
+1000
 0
 Bloom filter on non-sort key
-10000
+1000
 0
diff --git a/tests/queries/0_stateless/02231_bloom_filter_sizing.sql b/tests/queries/0_stateless/02231_bloom_filter_sizing.sql
index 233e3111067..ee896675d64 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(1000 * 1000);
+FROM numbers(100_000);
 
 --
 -- 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(1000 * 1000);
+FROM numbers(100_000);
 
 --
 -- Merge everything into a single part
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 c830d790000..147e368b5c9 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	2099-07-07
+toStartOfWeek;toDateTime64;false	1970-01-01
 type;toStartOfWeek;toDateTime64;false	Date
 toMonday;toDate32;false	2099-07-08
 type;toMonday;toDate32;false	Date
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 8dd8910c858..c39f1fb1ce9 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
@@ -562,6 +562,7 @@ positionCaseInsensitive
 positionCaseInsensitiveUTF8
 positionUTF8
 pow
+printf
 proportionsZTest
 protocol
 queryID
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 f85aaed7716..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
@@ -10,22 +10,23 @@ export DATA_FILE="$CLICKHOUSE_TMP/deduptest.tsv"
 export TEST_MARK="02434_insert_${CLICKHOUSE_DATABASE}_"
 
 $CLICKHOUSE_CLIENT -q 'select * from numbers(5000000) format TSV' > $DATA_FILE
-$CLICKHOUSE_CLIENT -q 'create table dedup_test(A Int64) Engine = MergeTree order by A settings non_replicated_deduplication_window=1000;'
+$CLICKHOUSE_CLIENT -q "create table dedup_test(A Int64) Engine = MergeTree order by A settings non_replicated_deduplication_window=1000, merge_tree_clear_old_temporary_directories_interval_seconds = 1;"
 $CLICKHOUSE_CLIENT -q "create table dedup_dist(A Int64) Engine = Distributed('test_cluster_one_shard_two_replicas', currentDatabase(), dedup_test)"
 
 function insert_data
 {
-    SETTINGS="query_id=$ID&max_insert_block_size=110000&min_insert_block_size_rows=110000"
+    # send_logs_level: https://github.com/ClickHouse/ClickHouse/issues/67599
+    SETTINGS="query_id=$ID&max_insert_block_size=110000&min_insert_block_size_rows=110000&send_logs_level=fatal"
     # max_block_size=10000, so external table will contain smaller blocks that will be squashed on insert-select (more chances to catch a bug on query cancellation)
     TRASH_SETTINGS="query_id=$ID&input_format_parallel_parsing=0&max_threads=1&max_insert_threads=1&max_insert_block_size=110000&max_block_size=10000&min_insert_block_size_bytes=0&min_insert_block_size_rows=110000&max_insert_block_size=110000"
     TYPE=$(( RANDOM % 5 ))
 
     if [[ "$TYPE" -eq 0 ]]; then
         # client will send 10000-rows blocks, server will squash them into 110000-rows blocks (more chances to catch a bug on query cancellation)
-        $CLICKHOUSE_CLIENT --max_block_size=10000 --max_insert_block_size=10000 --query_id="$ID" \
+        $CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=fatal --max_block_size=10000 --max_insert_block_size=10000 --query_id="$ID" \
             -q 'insert into dedup_test settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV' < $DATA_FILE
     elif [[ "$TYPE" -eq 1 ]]; then
-        $CLICKHOUSE_CLIENT --max_block_size=10000 --max_insert_block_size=10000 --query_id="$ID" --prefer_localhost_replica="$(( RANDOM % 2))" \
+        $CLICKHOUSE_CLIENT --allow_repeated_settings --send_logs_level=fatal --max_block_size=10000 --max_insert_block_size=10000 --query_id="$ID" --prefer_localhost_replica="$(( RANDOM % 2))" \
             -q 'insert into dedup_dist settings max_insert_block_size=110000, min_insert_block_size_rows=110000 format TSV' < $DATA_FILE
     elif [[ "$TYPE" -eq 2 ]]; then
         $CLICKHOUSE_CURL -sS -X POST --data-binary @- "$CLICKHOUSE_URL&$SETTINGS&query=insert+into+dedup_test+format+TSV" < $DATA_FILE
diff --git a/tests/queries/0_stateless/02473_multistep_prewhere.python b/tests/queries/0_stateless/02473_multistep_prewhere.python
index 11095202039..09326b6365d 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
+from pure_http_client import ClickHouseClient, requests_session_with_retries
 
 
 class Tester:
@@ -195,7 +195,7 @@ def main():
     default_index_granularity = 10
     total_rows = 7 * default_index_granularity
     step = default_index_granularity
-    session = requests.Session()
+    session = requests_session_with_retries()
     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 19444994fd2..10e94059171 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
+from pure_http_client import ClickHouseClient, requests_session_with_retries
 
 
 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()
+    session = requests_session_with_retries()
     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/02477_analyzer_function_hints.sh b/tests/queries/0_stateless/02477_analyzer_function_hints.sh
index d49c20cab75..f83935e47fb 100755
--- a/tests/queries/0_stateless/02477_analyzer_function_hints.sh
+++ b/tests/queries/0_stateless/02477_analyzer_function_hints.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# Tags: no-parallel
-
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -14,11 +12,11 @@ $CLICKHOUSE_CLIENT -q "SELECT plu(1, 1) SETTINGS allow_experimental_analyzer = 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_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 "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 allow_experimental_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 "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;
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 b0088017d32..91e6c4960e0 100755
--- a/tests/queries/0_stateless/02481_async_insert_race_long.sh
+++ b/tests/queries/0_stateless/02481_async_insert_race_long.sh
@@ -7,7 +7,7 @@ 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_ms 10 --async_insert_max_data_size 1 --async_insert 1"
+export MY_CLICKHOUSE_CLIENT="$CLICKHOUSE_CLIENT --async_insert_busy_timeout_min_ms 50 --async_insert_busy_timeout_max_ms 50 --async_insert 1"
 
 function insert1()
 {
@@ -29,11 +29,8 @@ 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')" &
-        sleep 0.05
+        ${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')"
     done
-
-    wait
 }
 
 function select1()
diff --git a/tests/queries/0_stateless/02514_null_dictionary_source.sql b/tests/queries/0_stateless/02514_null_dictionary_source.sql
index 74fb57707ff..bfd36042f57 100644
--- a/tests/queries/0_stateless/02514_null_dictionary_source.sql
+++ b/tests/queries/0_stateless/02514_null_dictionary_source.sql
@@ -1,5 +1,3 @@
--- Tags: no-parallel
-
 DROP DICTIONARY IF EXISTS null_dict;
 CREATE DICTIONARY null_dict (
     id              UInt64,
diff --git a/tests/queries/0_stateless/02703_row_policies_for_asterisk.sh b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sh
new file mode 100755
index 00000000000..f9670e5f6f8
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_asterisk.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery "
+    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
deleted file mode 100644
index 96b1c01a6d6..00000000000
--- a/tests/queries/0_stateless/02703_row_policies_for_asterisk.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- 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
new file mode 100755
index 00000000000..35151eed220
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policies_for_database_combination.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery "
+
+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
deleted file mode 100644
index 8c93fc595ba..00000000000
--- a/tests/queries/0_stateless/02703_row_policies_for_database_combination.sql
+++ /dev/null
@@ -1,88 +0,0 @@
--- 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 b67ea69ae72..56b0d8c6f20 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 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.`*`
+  -- 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.`*`
 R1, R2: (x == 1) OR (x == 2)
 1
 2
 Check system.query_log
 SELECT \'-- row policies for database\';	[]
-SELECT \'  -- SHOW CREATE POLICY db1_02703 ON db1_02703.*\';	[]
-SELECT \'  -- SHOW CREATE POLICY ON db1_02703.*\';	[]
-SELECT \'  -- SHOW CREATE POLICY ON db1_02703.`*`\';	[]
+SELECT \'  -- SHOW CREATE POLICY default ON default.*\';	[]
+SELECT \'  -- SHOW CREATE POLICY ON default.*\';	[]
+SELECT \'  -- SHOW CREATE POLICY ON default.`*`\';	[]
 SELECT \'R1, R2: (x == 1) OR (x == 2)\';	[]
-SELECT * FROM 02703_rqtable_default;	['`02703_filter_11_db` ON default.*','`02703_filter_11` ON default.`02703_rqtable_default`']
+SELECT * FROM 02703_rqtable_default;	['default_filter_11_db_policy ON default.*','default_filter_11_policy ON default.`02703_rqtable_default`']
 SELECT \'Check system.query_log\';	[]
   -- CREATE DATABASE-LEVEL POLICY IN CURRENT DATABASE
-CREATE ROW POLICY db2_02703 ON db1_02703.* TO u1_02703
+CREATE ROW POLICY db2_02703 ON default.* TO user_default
diff --git a/tests/queries/0_stateless/02703_row_policy_for_database.sh b/tests/queries/0_stateless/02703_row_policy_for_database.sh
new file mode 100755
index 00000000000..e94bc7acd5e
--- /dev/null
+++ b/tests/queries/0_stateless/02703_row_policy_for_database.sh
@@ -0,0 +1,59 @@
+#!/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 --multiquery "
+
+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 --multiquery "
+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
deleted file mode 100644
index 51ce5f4f870..00000000000
--- a/tests/queries/0_stateless/02703_row_policy_for_database.sql
+++ /dev/null
@@ -1,53 +0,0 @@
--- 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/02714_local_object_storage.sql b/tests/queries/0_stateless/02714_local_object_storage.sql
index 914eac1ddba..bfe3162df97 100644
--- a/tests/queries/0_stateless/02714_local_object_storage.sql
+++ b/tests/queries/0_stateless/02714_local_object_storage.sql
@@ -1,3 +1,5 @@
+-- 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/02770_async_buffer_ignore.sh b/tests/queries/0_stateless/02770_async_buffer_ignore.sh
index 6eaf655324d..37f002767d6 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
+# Tags: no-fasttest, no-random-settings, no-distributed-cache
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02833_concurrent_sessions.sh b/tests/queries/0_stateless/02833_concurrent_sessions.sh
index 846661cfeed..feaff3a38a3 100755
--- a/tests/queries/0_stateless/02833_concurrent_sessions.sh
+++ b/tests/queries/0_stateless/02833_concurrent_sessions.sh
@@ -137,7 +137,23 @@ ${CLICKHOUSE_CLIENT} -q "SELECT count(*) FROM system.session_log WHERE user IN (
 for user in "${ALL_USERS[@]}"; do
     ${CLICKHOUSE_CLIENT} -q "DROP USER ${user}"
     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')"
+
+    # 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 "LoginFailure"
     ${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM system.session_log WHERE user = '${user}' AND type = 'LoginFailure'"
  done
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 347ebd22f96..c32003a2a11 100755
--- a/tests/queries/0_stateless/02835_drop_user_during_session.sh
+++ b/tests/queries/0_stateless/02835_drop_user_during_session.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,11 +104,27 @@ 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" 
-${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 "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 "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/02843_backup_use_same_password_for_base_backup.reference b/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.reference
new file mode 100644
index 00000000000..cdcf0532cd9
--- /dev/null
+++ b/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.reference
@@ -0,0 +1,21 @@
+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
new file mode 100755
index 00000000000..a2b1a953e24
--- /dev/null
+++ b/tests/queries/0_stateless/02843_backup_use_same_password_for_base_backup.sh
@@ -0,0 +1,50 @@
+#!/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/02910_bad_logs_level_in_local.sh b/tests/queries/0_stateless/02910_bad_logs_level_in_local.sh
index badf7232a95..b5de10bf191 100755
--- a/tests/queries/0_stateless/02910_bad_logs_level_in_local.sh
+++ b/tests/queries/0_stateless/02910_bad_logs_level_in_local.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/expect -f
 
 log_user 0
-set timeout 60
+set timeout 30
 match_max 100000
 
 spawn bash -c "clickhouse-local"
 
 expect ":) "
 send -- "SET send_logs_level = 't'\r"
-expect "Exception on client:"
+expect "Unexpected value of LogsLevel:" {} timeout {exit 1}
 expect ":) "
 send -- "exit\r"
 expect eof
diff --git a/tests/queries/0_stateless/02952_archive_parsing.sql b/tests/queries/0_stateless/02952_archive_parsing.sql
deleted file mode 100644
index 49b0223e6ec..00000000000
--- a/tests/queries/0_stateless/02952_archive_parsing.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT * FROM file('::a'); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/02995_baseline_23_12_1.tsv b/tests/queries/0_stateless/02995_baseline_24_7_2.tsv
similarity index 82%
rename from tests/queries/0_stateless/02995_baseline_23_12_1.tsv
rename to tests/queries/0_stateless/02995_baseline_24_7_2.tsv
index a391473e7c9..10b392f3e04 100644
--- a/tests/queries/0_stateless/02995_baseline_23_12_1.tsv
+++ b/tests/queries/0_stateless/02995_baseline_24_7_2.tsv
@@ -11,23 +11,28 @@ 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	0
+allow_experimental_analyzer	1
 allow_experimental_annoy_index	0
 allow_experimental_bigint_types	1
 allow_experimental_codecs	0
 allow_experimental_database_atomic	1
 allow_experimental_database_materialized_mysql	0
 allow_experimental_database_materialized_postgresql	0
-allow_experimental_database_replicated	0
+allow_experimental_database_replicated	1
+allow_experimental_dynamic_type	0
+allow_experimental_full_text_index	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
@@ -40,12 +45,15 @@ allow_experimental_query_cache	1
 allow_experimental_query_deduplication	0
 allow_experimental_refreshable_materialized_view	0
 allow_experimental_s3queue	1
-allow_experimental_shared_merge_tree	0
+allow_experimental_shared_merge_tree	1
+allow_experimental_statistic	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
@@ -58,17 +66,21 @@ 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
@@ -76,20 +88,42 @@ 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	1000000
+async_insert_max_data_size	10485760
 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
@@ -107,6 +141,7 @@ 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
@@ -115,6 +150,7 @@ 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
@@ -123,6 +159,7 @@ 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
@@ -141,9 +178,12 @@ 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
@@ -156,15 +196,19 @@ 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_table_engine	None
+default_normal_view_sql_security	INVOKER
+default_table_engine	MergeTree
 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
@@ -182,6 +226,7 @@ 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
@@ -191,6 +236,7 @@ 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
@@ -205,6 +251,7 @@ 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
@@ -216,7 +263,9 @@ 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
@@ -231,10 +280,12 @@ 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
@@ -278,7 +329,9 @@ 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
@@ -288,8 +341,11 @@ 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
@@ -300,8 +356,10 @@ 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
@@ -326,10 +384,14 @@ 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
@@ -341,12 +403,14 @@ 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
@@ -354,29 +418,37 @@ 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
@@ -384,11 +456,13 @@ 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
@@ -398,17 +472,21 @@ input_format_parquet_case_insensitive_column_matching	0
 input_format_parquet_filter_push_down	1
 input_format_parquet_import_nested	0
 input_format_parquet_local_file_min_bytes_for_seek	8192
-input_format_parquet_max_block_size	8192
+input_format_parquet_max_block_size	65409
+input_format_parquet_prefer_block_bytes	16744704
 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
@@ -450,7 +528,12 @@ 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
@@ -461,7 +544,7 @@ local_filesystem_read_prefetch	0
 lock_acquire_timeout	120
 log_comment	
 log_formatted_queries	0
-log_processors_profiles	0
+log_processors_profiles	1
 log_profile_events	1
 log_queries	1
 log_queries_cut_to_length	100000
@@ -474,6 +557,8 @@ 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)\'
@@ -501,6 +586,7 @@ 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
@@ -528,7 +614,9 @@ 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
@@ -537,6 +625,7 @@ 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
@@ -549,7 +638,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	100000
+max_rows_in_set_to_optimize_join	0
 max_rows_to_group_by	0
 max_rows_to_read	0
 max_rows_to_read_leaf	0
@@ -557,6 +646,7 @@ 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
@@ -592,6 +682,7 @@ 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	
@@ -604,6 +695,8 @@ 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
@@ -619,8 +712,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	0
-mysql_map_string_to_text_in_show_columns	0
+mysql_map_fixed_string_to_text_in_show_columns	1
+mysql_map_string_to_text_in_show_columns	1
 mysql_max_rows_to_insert	65536
 network_compression_method	LZ4
 network_zstd_compression_level	1
@@ -647,6 +740,7 @@ 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
@@ -664,7 +758,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	0
+optimize_rewrite_sum_if_to_count_if	1
 optimize_skip_merged_partitions	0
 optimize_skip_unused_shards	0
 optimize_skip_unused_shards_limit	1000
@@ -674,9 +768,10 @@ 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	1
+optimize_trivial_insert_select	0
 optimize_uniq_to_count	1
 optimize_use_implicit_projections	1
 optimize_use_projections	1
@@ -685,13 +780,19 @@ os_thread_priority	0
 output_format_arrow_compression_method	lz4_frame
 output_format_arrow_fixed_string_as_fixed_byte_array	1
 output_format_arrow_low_cardinality_as_dictionary	0
-output_format_arrow_string_as_string	0
+output_format_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_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
@@ -705,27 +806,34 @@ output_format_json_skip_null_value_in_named_tuples	0
 output_format_json_validate_utf8	0
 output_format_markdown_escape_special_characters	0
 output_format_msgpack_uuid_representation	ext
-output_format_orc_compression_method	lz4
+output_format_native_encode_types_in_binary_format	0
+output_format_orc_compression_method	zstd
 output_format_orc_row_index_stride	10000
-output_format_orc_string_as_string	0
+output_format_orc_string_as_string	1
 output_format_parallel_formatting	1
 output_format_parquet_batch_size	1024
 output_format_parquet_compliant_nested_types	1
-output_format_parquet_compression_method	lz4
+output_format_parquet_compression_method	zstd
 output_format_parquet_data_page_size	1048576
 output_format_parquet_fixed_string_as_fixed_byte_array	1
 output_format_parquet_parallel_encoding	1
 output_format_parquet_row_group_size	1000000
 output_format_parquet_row_group_size_bytes	536870912
-output_format_parquet_string_as_string	0
-output_format_parquet_use_custom_encoder	0
+output_format_parquet_string_as_string	1
+output_format_parquet_use_custom_encoder	1
 output_format_parquet_version	2.latest
-output_format_pretty_color	1
+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_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_row_numbers	0
+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_protobuf_nullables_with_google_wrappers	0
 output_format_schema	
 output_format_sql_insert_include_column_names	1
@@ -734,15 +842,22 @@ 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
@@ -755,11 +870,14 @@ 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
@@ -767,7 +885,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	0
+print_pretty_type_names	1
 priority	0
 query_cache_compress_entries	1
 query_cache_max_entries	0
@@ -778,8 +896,10 @@ 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
@@ -788,6 +908,8 @@ 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
@@ -806,7 +928,9 @@ 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
@@ -835,17 +959,20 @@ 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_http_connection_pool_size	1000
+s3_ignore_file_doesnt_exist	0
 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
@@ -860,6 +987,8 @@ 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
@@ -887,6 +1016,8 @@ 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
@@ -898,8 +1029,10 @@ 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
@@ -912,8 +1045,10 @@ 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
@@ -923,12 +1058,15 @@ 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_index_2.sh b/tests/queries/0_stateless/02995_index_2.sh
index a32f5c511f8..a78e0f40649 100755
--- a/tests/queries/0_stateless/02995_index_2.sh
+++ b/tests/queries/0_stateless/02995_index_2.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage
+# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02995_index_3.sh b/tests/queries/0_stateless/02995_index_3.sh
index 9cc937391fc..4392259e8a0 100755
--- a/tests/queries/0_stateless/02995_index_3.sh
+++ b/tests/queries/0_stateless/02995_index_3.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage
+# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02995_index_4.sh b/tests/queries/0_stateless/02995_index_4.sh
index e450997e48b..9d7caf9f388 100755
--- a/tests/queries/0_stateless/02995_index_4.sh
+++ b/tests/queries/0_stateless/02995_index_4.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage
+# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02995_index_9.sh b/tests/queries/0_stateless/02995_index_9.sh
index 4b78777cd2a..8b10acbd72d 100755
--- a/tests/queries/0_stateless/02995_index_9.sh
+++ b/tests/queries/0_stateless/02995_index_9.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage
+# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage, no-distributed-cache
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
index 8de98c55b6a..7fb21f88fae 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 23.12.1
-# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_23_12_1.tsv
+# 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
 $CLICKHOUSE_LOCAL --query "
     WITH old_settings AS
     (
-        SELECT * FROM file('${CUR_DIR}/02995_baseline_23_12_1.tsv', 'TSV', 'name String, default String')
+        SELECT * FROM file('${CUR_DIR}/02995_baseline_24_7_2.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.h: ' || name || ' WAS ADDED',
+        SELECT 'PLEASE ADD THE NEW SETTING TO SettingsChangesHistory.cpp: ' || 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] >= '24'
+            WHERE splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 7
         ))
         UNION ALL
         (
-            SELECT 'PLEASE ADD THE SETTING VALUE CHANGE TO SettingsChangesHistory.h: ' || name || ' WAS CHANGED FROM ' || old_settings.default || ' TO ' || new_settings.default,
+            SELECT 'PLEASE ADD THE SETTING VALUE CHANGE TO SettingsChangesHistory.cpp: ' || name || ' WAS CHANGED FROM ' || old_settings.default || ' TO ' || new_settings.default,
             FROM new_settings
             LEFT JOIN old_settings ON new_settings.name = old_settings.name
             WHERE (new_settings.default != old_settings.default) AND (name NOT IN (
                 SELECT arrayJoin(tupleElement(changes, 'name'))
                 FROM system.settings_changes
-                WHERE splitByChar('.', version())[1] >= '24'
+                WHERE splitByChar('.', version)[1]::UInt64 >= 24 AND splitByChar('.', version)[2]::UInt64 > 7
             ))
         )
     )
diff --git a/tests/queries/0_stateless/03036_dynamic_read_subcolumns.lib b/tests/queries/0_stateless/03036_dynamic_read_subcolumns.lib
deleted file mode 100755
index 4914051db82..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns.lib
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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_subcolumns_1.reference b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.reference
deleted file mode 100644
index 0d51ecfac3b..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.reference
+++ /dev/null
@@ -1,19 +0,0 @@
-Memory
-test
-Array(Array(Dynamic))
-Array(Variant(String, UInt64))
-None
-String
-UInt64
-200000
-200000
-200000
-200000
-0
-0
-200000
-200000
-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
deleted file mode 100755
index ed548ae74e9..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_1.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Tags: long
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# 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_subcolumns_2.reference b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.reference
deleted file mode 100644
index 099b7574566..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.reference
+++ /dev/null
@@ -1,19 +0,0 @@
-MergeTree compact
-test
-Array(Array(Dynamic))
-Array(Variant(String, UInt64))
-None
-String
-UInt64
-200000
-200000
-200000
-200000
-0
-0
-200000
-200000
-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
deleted file mode 100755
index 95dafcf5832..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_2.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Tags: long
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# 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_subcolumns_3.reference b/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.reference
deleted file mode 100644
index 35db4a22b4c..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.reference
+++ /dev/null
@@ -1,19 +0,0 @@
-MergeTree wide
-test
-Array(Array(Dynamic))
-Array(Variant(String, UInt64))
-None
-String
-UInt64
-200000
-200000
-200000
-200000
-0
-0
-200000
-200000
-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
deleted file mode 100755
index a3c2d93e568..00000000000
--- a/tests/queries/0_stateless/03036_dynamic_read_subcolumns_3.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Tags: long
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# 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/03037_dynamic_merges_2_horizontal_compact_merge_tree.reference b/tests/queries/0_stateless/03037_dynamic_merges_2_horizontal_compact_merge_tree.reference
index afd392002e5..253d87de5f0 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 @@
-1000000	Array(UInt16)
-1000000	String
-1000000	UInt64
+200000	Array(UInt16)
+200000	String
+200000	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 48a6a55378c..71c6841515a 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
@@ -6,9 +6,9 @@ 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;
 system stop merges test;
-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);
+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);
 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 afd392002e5..253d87de5f0 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 @@
-1000000	Array(UInt16)
-1000000	String
-1000000	UInt64
+200000	Array(UInt16)
+200000	String
+200000	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 44b298b1c35..94ae1d867f5 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
@@ -6,9 +6,9 @@ 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;
 system stop merges test;
-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);
+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);
 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 afd392002e5..253d87de5f0 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 @@
-1000000	Array(UInt16)
-1000000	String
-1000000	UInt64
+200000	Array(UInt16)
+200000	String
+200000	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 f42150720b3..98ae230636a 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
@@ -6,9 +6,9 @@ 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;
 system stop merges test;
-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);
+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);
 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 afd392002e5..253d87de5f0 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 @@
-1000000	Array(UInt16)
-1000000	String
-1000000	UInt64
+200000	Array(UInt16)
+200000	String
+200000	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 ee4ff6af162..f8f5bd5d9e1 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
@@ -6,9 +6,9 @@ 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;
 system stop merges test;
-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);
+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);
 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/03038_nested_dynamic_merges_compact_horizontal.sql b/tests/queries/0_stateless/03038_nested_dynamic_merges_compact_horizontal.sql
index e0636f053df..13c1fd8b485 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,4 +1,4 @@
--- Tags: long
+-- 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_variant_type = 1;
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 edfad295e9a..daa95071cdb 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,4 +1,4 @@
--- Tags: long
+-- 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_variant_type = 1;
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
new file mode 100644
index 00000000000..ae07c164074
--- /dev/null
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_small.reference.j2
@@ -0,0 +1,84 @@
+2	Tuple(a Dynamic(max_types=3)):Date
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):String
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	UInt64:None
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	UInt64:None
+2	Tuple(a Dynamic(max_types=3)):DateTime
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+13	Tuple(a Dynamic(max_types=3)):None
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+12	Tuple(a Dynamic(max_types=3)):String
+13	Tuple(a Dynamic(max_types=3)):None
+2	Tuple(a Dynamic(max_types=3)):Date
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):String
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	UInt64:None
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	UInt64:None
+2	Tuple(a Dynamic(max_types=3)):DateTime
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+13	Tuple(a Dynamic(max_types=3)):None
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+12	Tuple(a Dynamic(max_types=3)):String
+13	Tuple(a Dynamic(max_types=3)):None
+2	Tuple(a Dynamic(max_types=3)):Date
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):String
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	UInt64:None
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	UInt64:None
+2	Tuple(a Dynamic(max_types=3)):DateTime
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+13	Tuple(a Dynamic(max_types=3)):None
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+12	Tuple(a Dynamic(max_types=3)):String
+13	Tuple(a Dynamic(max_types=3)):None
+2	Tuple(a Dynamic(max_types=3)):Date
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):String
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	UInt64:None
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	UInt64:None
+2	Tuple(a Dynamic(max_types=3)):DateTime
+3	Tuple(a Dynamic(max_types=3)):Array(UInt8)
+5	Tuple(a Dynamic(max_types=3)):UInt64
+7	Tuple(a Dynamic(max_types=3)):String
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+13	Tuple(a Dynamic(max_types=3)):None
+5	Tuple(a Dynamic(max_types=3)):UInt64
+10	Tuple(a Dynamic(max_types=3)):Tuple(UInt64)
+10	UInt64:None
+12	Tuple(a Dynamic(max_types=3)):String
+13	Tuple(a Dynamic(max_types=3)):None
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
new file mode 100644
index 00000000000..7828c2af49c
--- /dev/null
+++ b/tests/queries/0_stateless/03038_nested_dynamic_merges_small.sql.j2
@@ -0,0 +1,35 @@
+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'] -%}
+
+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, lock_acquire_timeout_for_background_operations=600;
+
+system stop merges test;
+insert into test select number, number from numbers(10);
+insert into test select number, tuple(if(number % 2 == 0, number, 'str_' || toString(number)))::Tuple(a Dynamic(max_types=3)) from numbers(10);
+insert into test select number, tuple(if(number % 3 == 0, toDate(number), range(number % 10)))::Tuple(a Dynamic(max_types=3)) from numbers(5);
+
+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 count(), dynamicType(d) || ':' || dynamicType(d.`Tuple(a Dynamic(max_types=3))`.a) as type from test group by type order by count(), type;
+
+insert into test select number, tuple(if(number % 3 == 0, toDateTime(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(5);
+insert into test select number, tuple(if(number % 2 == 0, tuple(number), NULL))::Tuple(a Dynamic(max_types=3)) from numbers(20);
+
+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 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;
+
+{% endfor -%}
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 79d488ec253..dea7e7c0971 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,4 +1,4 @@
--- Tags: long
+-- 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_variant_type = 1;
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 e2a453b867a..bf1323f2ea9 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,4 +1,4 @@
--- Tags: long
+-- 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_variant_type = 1;
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 17a67511030..4b211a6a1e1 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,5 @@
--- Tags: long
+-- Tags: long, no-random-merge-tree-settings, no-distributed-cache
+-- no-random-merge-tree-settings - times out in private
 
 DROP TABLE IF EXISTS build;
 DROP TABLE IF EXISTS skewed_probe;
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 ac2070fbd76..a6932e0536c 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,8 +21,9 @@ 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['S3ReadRequestsCount'] - ProfileEvents['S3ReadRequestsErrors'],
     ProfileEvents['ReadBufferFromS3Bytes'] < ProfileEvents['ReadCompressedBytes'] * 1.1
 FROM system.query_log
 WHERE event_date >= yesterday() AND type = 'QueryFinish'
@@ -30,7 +31,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['S3ReadRequestsCount'] - ProfileEvents['S3ReadRequestsErrors'],
     ProfileEvents['ReadBufferFromS3Bytes'] < ProfileEvents['ReadCompressedBytes'] * 1.1
 FROM system.query_log
 WHERE event_date >= yesterday() AND type = 'QueryFinish'
diff --git a/tests/queries/0_stateless/03203_client_benchmark_options.sh b/tests/queries/0_stateless/03203_client_benchmark_options.sh
index 37a1f2cd3ac..967db056c0b 100755
--- a/tests/queries/0_stateless/03203_client_benchmark_options.sh
+++ b/tests/queries/0_stateless/03203_client_benchmark_options.sh
@@ -5,10 +5,10 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 output=$(${CLICKHOUSE_CLIENT} -t -q "SELECT sleepEachRow(2) FORMAT Null" 2>&1)
-{ echo "$output" | grep -q "^2\." && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
+{ 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)
-{ echo "$output" | grep -q "^2\." && echo "Ok"; } || { echo "Fail"; echo "'$output'"; }
+{ 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'"; }
diff --git a/tests/queries/0_stateless/03203_function_printf.reference b/tests/queries/0_stateless/03203_function_printf.reference
new file mode 100644
index 00000000000..338ecb0183d
--- /dev/null
+++ b/tests/queries/0_stateless/03203_function_printf.reference
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 00000000000..6ff4699c8a7
--- /dev/null
+++ b/tests/queries/0_stateless/03203_function_printf.sql
@@ -0,0 +1,39 @@
+-- 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/03208_uniq_with_empty_tuple.reference b/tests/queries/0_stateless/03208_uniq_with_empty_tuple.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/03208_uniq_with_empty_tuple.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/03208_uniq_with_empty_tuple.sql b/tests/queries/0_stateless/03208_uniq_with_empty_tuple.sql
new file mode 100644
index 00000000000..09eeaf6f370
--- /dev/null
+++ b/tests/queries/0_stateless/03208_uniq_with_empty_tuple.sql
@@ -0,0 +1,4 @@
+-- Tags: no-fasttest
+-- https://github.com/ClickHouse/ClickHouse/issues/67303
+SELECT uniqTheta(tuple());
+SELECT uniq(tuple());
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
new file mode 100644
index 00000000000..e4e6c313b85
--- /dev/null
+++ b/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.reference
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000000..7fe84929910
--- /dev/null
+++ b/tests/queries/0_stateless/03209_parameterized_view_with_non_literal_params.sql
@@ -0,0 +1,99 @@
+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/02952_archive_parsing.reference b/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.reference
similarity index 100%
rename from tests/queries/0_stateless/02952_archive_parsing.reference
rename to tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.reference
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
new file mode 100644
index 00000000000..0fc5f072da5
--- /dev/null
+++ b/tests/queries/0_stateless/03210_empty_tuple_lhs_of_in.sql
@@ -0,0 +1 @@
+SELECT tuple() IN tuple(1) SETTINGS allow_experimental_map_type = 1; -- { serverError INCORRECT_ELEMENT_OF_SET }
diff --git a/tests/queries/0_stateless/03210_variant_with_aggregate_function_type.reference b/tests/queries/0_stateless/03210_variant_with_aggregate_function_type.reference
new file mode 100644
index 00000000000..105e8e7d8bd
--- /dev/null
+++ b/tests/queries/0_stateless/03210_variant_with_aggregate_function_type.reference
@@ -0,0 +1,6 @@
+	500
+fail	500
+	499
+fail	500
+	500	499
+fail	500	500
diff --git a/tests/queries/0_stateless/03210_variant_with_aggregate_function_type.sql b/tests/queries/0_stateless/03210_variant_with_aggregate_function_type.sql
new file mode 100644
index 00000000000..cb9cdb0b456
--- /dev/null
+++ b/tests/queries/0_stateless/03210_variant_with_aggregate_function_type.sql
@@ -0,0 +1,60 @@
+SET allow_experimental_variant_type = 1;
+
+DROP TABLE IF EXISTS source;
+CREATE TABLE source 
+(
+   Name String,
+   Value Int64
+
+) ENGINE = MergeTree ORDER BY ();
+
+INSERT INTO source SELECT ['fail', 'success'][number % 2] as Name, number AS Value FROM numbers(1000);
+
+DROP TABLE IF EXISTS test_agg_variant;
+CREATE TABLE test_agg_variant
+(
+   Name String,
+   Value Variant(AggregateFunction(uniqExact, Int64), AggregateFunction(avg, Int64))
+)
+ENGINE = MergeTree
+ORDER BY (Name);
+
+INSERT INTO test_agg_variant
+SELECT
+    Name,
+    t AS Value
+FROM
+(
+    SELECT
+        Name,
+        arrayJoin([
+            uniqExactState(Value)::Variant(AggregateFunction(uniqExact, Int64), AggregateFunction(avg, Int64)), 
+            avgState(Value)::Variant(AggregateFunction(uniqExact, Int64), AggregateFunction(avg, Int64))
+        ]) AS t
+    FROM source
+    GROUP BY Name 
+);
+
+SELECT
+    Name,
+    uniqExactMerge(Value.`AggregateFunction(uniqExact, Int64)`) AS Value
+FROM test_agg_variant
+GROUP BY Name;
+
+SELECT
+    Name,
+    avgMerge(Value.`AggregateFunction(avg, Int64)`) AS Value
+FROM test_agg_variant
+GROUP BY Name;
+
+SELECT
+    Name,
+    uniqExactMerge(Value.`AggregateFunction(uniqExact, Int64)`) AS ValueUniq,
+    avgMerge(Value.`AggregateFunction(avg, Int64)`) AS ValueAvg
+FROM test_agg_variant
+GROUP BY Name;
+
+
+DROP TABLE test_agg_variant;
+DROP TABLE source;
+
diff --git a/tests/queries/0_stateless/03213_deep_json.reference b/tests/queries/0_stateless/03213_deep_json.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03213_deep_json.sql b/tests/queries/0_stateless/03213_deep_json.sql
new file mode 100644
index 00000000000..2a9476381ff
--- /dev/null
+++ b/tests/queries/0_stateless/03213_deep_json.sql
@@ -0,0 +1,5 @@
+-- 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
new file mode 100644
index 00000000000..b49e179df68
--- /dev/null
+++ b/tests/queries/0_stateless/03213_denseRank_percentRank_alias.reference
@@ -0,0 +1,45 @@
+---- 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
new file mode 100644
index 00000000000..ff841294eb1
--- /dev/null
+++ b/tests/queries/0_stateless/03213_denseRank_percentRank_alias.sql
@@ -0,0 +1,59 @@
+-- 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/03214_bitslice_argument_evaluation.reference b/tests/queries/0_stateless/03214_bitslice_argument_evaluation.reference
new file mode 100644
index 00000000000..1731dfa0d79
--- /dev/null
+++ b/tests/queries/0_stateless/03214_bitslice_argument_evaluation.reference
@@ -0,0 +1,11 @@
+-- { 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
new file mode 100644
index 00000000000..1731dfa0d79
--- /dev/null
+++ b/tests/queries/0_stateless/03214_bitslice_argument_evaluation.sql
@@ -0,0 +1,11 @@
+-- { 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_join_on_tuple_comparison_elimination_bug.reference b/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.reference
new file mode 100644
index 00000000000..c90a64e4a47
--- /dev/null
+++ b/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.reference
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..7ef98f88cc7
--- /dev/null
+++ b/tests/queries/0_stateless/03214_join_on_tuple_comparison_elimination_bug.sql
@@ -0,0 +1,16 @@
+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_parsing_archive_name_file.reference b/tests/queries/0_stateless/03214_parsing_archive_name_file.reference
new file mode 100644
index 00000000000..d793d26dfc3
--- /dev/null
+++ b/tests/queries/0_stateless/03214_parsing_archive_name_file.reference
@@ -0,0 +1,16 @@
+::nonexistentfile.csv
+1
+nonexistent::nonexistentfile.csv
+1
+nonexistent :: nonexistentfile.csv
+1
+nonexistent ::nonexistentfile.csv
+1
+nonexistent.tar.gz :: nonexistentfile.csv
+1
+nonexistent.zip:: nonexistentfile.csv
+1
+nonexistent.tar.gz :: nonexistentfile.csv SETTINGS allow_archive_path_syntax=0
+1
+nonexistent.zip:: nonexistentfile.csv SETTINGS allow_archive_path_syntax=0
+1
diff --git a/tests/queries/0_stateless/03214_parsing_archive_name_file.sh b/tests/queries/0_stateless/03214_parsing_archive_name_file.sh
new file mode 100755
index 00000000000..b54cbb10aa6
--- /dev/null
+++ b/tests/queries/0_stateless/03214_parsing_archive_name_file.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function try_to_read_file()
+{
+    file_to_read=$1
+    file_argument=$2
+    settings=$3
+
+    echo $file_argument $settings
+    $CLICKHOUSE_LOCAL -q "SELECT * FROM file('$file_argument') $settings" 2>&1 | grep -c "Cannot stat file.*$file_to_read"
+}
+
+# if archive extension is not detected for part before '::', path is taken as is
+try_to_read_file "::nonexistentfile.csv" "::nonexistentfile.csv"
+try_to_read_file "nonexistent::nonexistentfile.csv" "nonexistent::nonexistentfile.csv"
+try_to_read_file "nonexistent :: nonexistentfile.csv" "nonexistent :: nonexistentfile.csv"
+try_to_read_file "nonexistent ::nonexistentfile.csv" "nonexistent ::nonexistentfile.csv"
+# if archive extension is detected for part before '::', path is split into archive and filename
+try_to_read_file "nonexistent.tar.gz" "nonexistent.tar.gz :: nonexistentfile.csv"
+try_to_read_file "nonexistent.zip" "nonexistent.zip:: nonexistentfile.csv"
+# disabling archive syntax will always parse path as is
+try_to_read_file "nonexistent.tar.gz :: nonexistentfile.csv" "nonexistent.tar.gz :: nonexistentfile.csv" "SETTINGS allow_archive_path_syntax=0"
+try_to_read_file "nonexistent.zip:: nonexistentfile.csv" "nonexistent.zip:: nonexistentfile.csv" "SETTINGS allow_archive_path_syntax=0"
diff --git a/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.reference b/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.reference
new file mode 100644
index 00000000000..584e34c0cde
--- /dev/null
+++ b/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.reference
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 00000000000..b2fd69d75d0
--- /dev/null
+++ b/tests/queries/0_stateless/03215_analyzer_materialized_constants_bug.sql
@@ -0,0 +1,26 @@
+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_analyzer_replace_with_dummy_tables.reference b/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.sql b/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.sql
new file mode 100644
index 00000000000..6d084c2ac50
--- /dev/null
+++ b/tests/queries/0_stateless/03215_analyzer_replace_with_dummy_tables.sql
@@ -0,0 +1,15 @@
+create table t (number UInt64) engine MergeTree order by number;
+
+SELECT 1
+FROM
+(
+    SELECT number IN (
+            SELECT number
+            FROM view(
+                SELECT number
+                FROM numbers(1)
+            )
+        )
+    FROM t
+)
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, allow_experimental_analyzer = 1; -- { serverError CLUSTER_DOESNT_EXIST }
diff --git a/tests/queries/0_stateless/03215_key_condition_bug.reference b/tests/queries/0_stateless/03215_key_condition_bug.reference
new file mode 100644
index 00000000000..84ab67a85e0
--- /dev/null
+++ b/tests/queries/0_stateless/03215_key_condition_bug.reference
@@ -0,0 +1 @@
+(0)
diff --git a/tests/queries/0_stateless/03215_key_condition_bug.sql b/tests/queries/0_stateless/03215_key_condition_bug.sql
new file mode 100644
index 00000000000..ef2113e81f8
--- /dev/null
+++ b/tests/queries/0_stateless/03215_key_condition_bug.sql
@@ -0,0 +1,3 @@
+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_parsing_archive_name_s3.reference b/tests/queries/0_stateless/03215_parsing_archive_name_s3.reference
new file mode 100644
index 00000000000..b27524812c7
--- /dev/null
+++ b/tests/queries/0_stateless/03215_parsing_archive_name_s3.reference
@@ -0,0 +1,3 @@
+::03215_archive.csv	test/::03215_archive.csv
+test::03215_archive.csv	test/test::03215_archive.csv
+test.zip::03215_archive.csv	test/test.zip::03215_archive.csv
diff --git a/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql b/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql
new file mode 100644
index 00000000000..e34be475c5a
--- /dev/null
+++ b/tests/queries/0_stateless/03215_parsing_archive_name_s3.sql
@@ -0,0 +1,7 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+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 }
+SELECT _file, _path FROM s3(s3_conn, filename='test::03215_archive.csv') ORDER BY (_file, _path);
+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
new file mode 100644
index 00000000000..fd698107f22
--- /dev/null
+++ b/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.reference
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 00000000000..1769d96aa8d
--- /dev/null
+++ b/tests/queries/0_stateless/03215_toStartOfWeek_with_dateTime64_fix.sql
@@ -0,0 +1,2 @@
+SELECT toStartOfWeek(toDateTime64('1970-01-01', 6));
+SELECT toStartOfWeek(toDateTime('1970-01-01'));
diff --git a/tests/queries/0_stateless/03215_udf_with_union.reference b/tests/queries/0_stateless/03215_udf_with_union.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/03215_udf_with_union.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/03215_udf_with_union.sql b/tests/queries/0_stateless/03215_udf_with_union.sql
new file mode 100644
index 00000000000..00390c5d930
--- /dev/null
+++ b/tests/queries/0_stateless/03215_udf_with_union.sql
@@ -0,0 +1,14 @@
+DROP FUNCTION IF EXISTS 03215_udf_with_union;
+CREATE FUNCTION 03215_udf_with_union AS () -> (
+    SELECT sum(s)
+    FROM
+    (
+        SELECT 1 AS s
+        UNION ALL
+        SELECT 1 AS s
+    )
+);
+
+SELECT 03215_udf_with_union();
+
+DROP FUNCTION 03215_udf_with_union;
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
new file mode 100644
index 00000000000..c5edc9e9963
--- /dev/null
+++ b/tests/queries/0_stateless/03215_varian_as_common_type_integers.reference
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..dcc69735534
--- /dev/null
+++ b/tests/queries/0_stateless/03215_varian_as_common_type_integers.sql
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..7dabd5388f4
--- /dev/null
+++ b/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.reference
@@ -0,0 +1,10 @@
+('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
new file mode 100644
index 00000000000..4a9a788ab18
--- /dev/null
+++ b/tests/queries/0_stateless/03215_varian_as_common_type_tuple_map.sql
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..825319e1c5b
--- /dev/null
+++ b/tests/queries/0_stateless/03216_arrayWithConstant_limits.reference
@@ -0,0 +1 @@
+10000000
diff --git a/tests/queries/0_stateless/03216_arrayWithConstant_limits.sql b/tests/queries/0_stateless/03216_arrayWithConstant_limits.sql
new file mode 100644
index 00000000000..c46524c50e6
--- /dev/null
+++ b/tests/queries/0_stateless/03216_arrayWithConstant_limits.sql
@@ -0,0 +1,3 @@
+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_json_merge_patch_stack_overflow.reference b/tests/queries/0_stateless/03217_json_merge_patch_stack_overflow.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03217_json_merge_patch_stack_overflow.sql b/tests/queries/0_stateless/03217_json_merge_patch_stack_overflow.sql
new file mode 100644
index 00000000000..4b366b08c6b
--- /dev/null
+++ b/tests/queries/0_stateless/03217_json_merge_patch_stack_overflow.sql
@@ -0,0 +1,9 @@
+-- Tags: no-fasttest
+-- Needs rapidjson library
+SELECT JSONMergePatch(REPEAT('{"c":', 1000000)); -- { serverError BAD_ARGUMENTS }
+SELECT JSONMergePatch(REPEAT('{"c":', 100000)); -- { serverError BAD_ARGUMENTS }
+SELECT JSONMergePatch(REPEAT('{"c":', 10000)); -- { serverError BAD_ARGUMENTS }
+SELECT JSONMergePatch(REPEAT('{"c":', 1000)); -- { serverError BAD_ARGUMENTS }
+SELECT JSONMergePatch(REPEAT('{"c":', 100)); -- { serverError BAD_ARGUMENTS }
+SELECT JSONMergePatch(REPEAT('{"c":', 10)); -- { serverError BAD_ARGUMENTS }
+SELECT JSONMergePatch(REPEAT('{"c":', 1)); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03220_replace_formatting.reference b/tests/queries/0_stateless/03220_replace_formatting.reference
new file mode 100644
index 00000000000..cbcd63839b1
--- /dev/null
+++ b/tests/queries/0_stateless/03220_replace_formatting.reference
@@ -0,0 +1,16 @@
+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
new file mode 100755
index 00000000000..1c11ed6da8d
--- /dev/null
+++ b/tests/queries/0_stateless/03220_replace_formatting.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+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/data_minio/::03215_archive.csv b/tests/queries/0_stateless/data_minio/::03215_archive.csv
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/::03215_archive.csv
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/data_minio/test.zip::03215_archive.csv b/tests/queries/0_stateless/data_minio/test.zip::03215_archive.csv
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/test.zip::03215_archive.csv
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/data_minio/test::03215_archive.csv b/tests/queries/0_stateless/data_minio/test::03215_archive.csv
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/test::03215_archive.csv
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/helpers/pure_http_client.py b/tests/queries/0_stateless/helpers/pure_http_client.py
index 0e7a4d27f4f..a31a91e0550 100644
--- a/tests/queries/0_stateless/helpers/pure_http_client.py
+++ b/tests/queries/0_stateless/helpers/pure_http_client.py
@@ -1,7 +1,8 @@
 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
 
@@ -18,7 +19,7 @@ class ClickHouseClient:
         self.host = host
 
     def query(
-        self, query, connection_timeout=1500, settings=dict(), binary_result=False
+        self, query, connection_timeout=500, settings=dict(), binary_result=False
     ):
         NUMBER_OF_TRIES = 30
         DELAY = 10
@@ -47,12 +48,12 @@ class ClickHouseClient:
                 else:
                     raise ValueError(r.text)
 
-    def query_return_df(self, query, connection_timeout=1500):
+    def query_return_df(self, query, connection_timeout=500):
         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=1500, settings=dict()):
+    def query_with_data(self, query, data, connection_timeout=500, settings=dict()):
         params = {
             "query": query,
             "timeout_before_checking_execution_speed": 120,
@@ -77,3 +78,17 @@ 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/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index b21ae0764c6..8a9a8d2e76c 100644
--- a/utils/check-style/aspell-ignore/en/aspell-dict.txt
+++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt
@@ -1733,6 +1733,7 @@ groupBitmap
 groupBitmapAnd
 groupBitmapOr
 groupBitmapXor
+groupConcat
 groupUniqArray
 grouparray
 grouparrayinsertat
@@ -1749,6 +1750,7 @@ groupbitmapor
 groupbitmapxor
 groupbitor
 groupbitxor
+groupconcat
 groupuniqarray
 grpc
 grpcio
@@ -2280,6 +2282,7 @@ prettyspacemonoblock
 prettyspacenoescapes
 prettyspacenoescapesmonoblock
 prewhere
+printf
 privateKeyFile
 privateKeyPassphraseHandler
 prlimit
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index b1391c2d781..75c10fa67b8 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -2,13 +2,16 @@ v24.7.2.13-stable	2024-08-01
 v24.7.1.2915-stable	2024-07-30
 v24.6.2.17-stable	2024-07-05
 v24.6.1.4423-stable	2024-07-01
+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.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
@@ -48,6 +51,7 @@ 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