diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ee14b3f0434..731119a9957 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 ### Changelog category (leave one):
 - New Feature
 - Improvement
-- Bug Fix (user-visible misbehaviour in official stable or prestable release)
+- Bug Fix (user-visible misbehavior in official stable or prestable release)
 - Performance Improvement
 - Backward Incompatible Change
 - Build/Testing/Packaging Improvement
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index f4cbcbf1790..9a96ccc9906 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -362,50 +362,50 @@ jobs:
           docker kill "$(docker ps -q)" ||:
           docker rm -f "$(docker ps -a -q)" ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
-  BuilderBinGCC:
-    needs: [DockerHubPush]
-    runs-on: [self-hosted, builder]
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/build_check
-          IMAGES_PATH=${{runner.temp}}/images_path
-          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
-          CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
-          BUILD_NAME=binary_gcc
-          EOF
-      - name: Download changed images
-        uses: actions/download-artifact@v2
-        with:
-          name: changed_images
-          path: ${{ env.IMAGES_PATH }}
-      - name: Clear repository
-        run: |
-          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Build
-        run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
-      - name: Upload build URLs to artifacts
-        if: ${{ success() || failure() }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
-      - name: Cleanup
-        if: always()
-        run: |
-          docker kill "$(docker ps -q)" ||:
-          docker rm -f "$(docker ps -a -q)" ||:
-          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
+  # BuilderBinGCC:
+  #   needs: [DockerHubPush]
+  #   runs-on: [self-hosted, builder]
+  #   steps:
+  #     - name: Set envs
+  #       run: |
+  #         cat >> "$GITHUB_ENV" << 'EOF'
+  #         TEMP_PATH=${{runner.temp}}/build_check
+  #         IMAGES_PATH=${{runner.temp}}/images_path
+  #         REPO_COPY=${{runner.temp}}/build_check/ClickHouse
+  #         CACHES_PATH=${{runner.temp}}/../ccaches
+  #         CHECK_NAME=ClickHouse build check (actions)
+  #         BUILD_NAME=binary_gcc
+  #         EOF
+  #     - name: Download changed images
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         name: changed_images
+  #         path: ${{ env.IMAGES_PATH }}
+  #     - name: Clear repository
+  #       run: |
+  #         sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+  #     - name: Check out repository code
+  #       uses: actions/checkout@v2
+  #     - name: Build
+  #       run: |
+  #         git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+  #         git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+  #         sudo rm -fr "$TEMP_PATH"
+  #         mkdir -p "$TEMP_PATH"
+  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+  #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+  #     - name: Upload build URLs to artifacts
+  #       if: ${{ success() || failure() }}
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: ${{ env.BUILD_URLS }}
+  #         path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
+  #     - name: Cleanup
+  #       if: always()
+  #       run: |
+  #         docker kill "$(docker ps -q)" ||:
+  #         docker rm -f "$(docker ps -a -q)" ||:
+  #         sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebAsan:
     needs: [DockerHubPush]
     runs-on: [self-hosted, builder]
@@ -1030,7 +1030,7 @@ jobs:
       - BuilderBinDarwin
       - BuilderBinDarwinAarch64
       - BuilderBinFreeBSD
-      - BuilderBinGCC
+      # - BuilderBinGCC
       - BuilderBinPPC64
       - BuilderBinTidy
       - BuilderDebSplitted
@@ -2685,40 +2685,40 @@ jobs:
           docker kill "$(docker ps -q)" ||:
           docker rm -f "$(docker ps -a -q)" ||:
           sudo rm -fr "$TEMP_PATH"
-  UnitTestsReleaseGCC:
-    needs: [BuilderBinGCC]
-    runs-on: [self-hosted, fuzzer-unit-tester]
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/unit_tests_asan
-          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Unit tests (release-gcc, actions)
-          REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v2
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Clear repository
-        run: |
-          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Unit test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 unit_tests_check.py "$CHECK_NAME"
-      - name: Cleanup
-        if: always()
-        run: |
-          docker kill "$(docker ps -q)" ||:
-          docker rm -f "$(docker ps -a -q)" ||:
-          sudo rm -fr "$TEMP_PATH"
+  # UnitTestsReleaseGCC:
+  #   needs: [BuilderBinGCC]
+  #   runs-on: [self-hosted, fuzzer-unit-tester]
+  #   steps:
+  #     - name: Set envs
+  #       run: |
+  #         cat >> "$GITHUB_ENV" << 'EOF'
+  #         TEMP_PATH=${{runner.temp}}/unit_tests_asan
+  #         REPORTS_PATH=${{runner.temp}}/reports_dir
+  #         CHECK_NAME=Unit tests (release-gcc, actions)
+  #         REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
+  #         EOF
+  #     - name: Download json reports
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         path: ${{ env.REPORTS_PATH }}
+  #     - name: Clear repository
+  #       run: |
+  #         sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+  #     - name: Check out repository code
+  #       uses: actions/checkout@v2
+  #     - name: Unit test
+  #       run: |
+  #         sudo rm -fr "$TEMP_PATH"
+  #         mkdir -p "$TEMP_PATH"
+  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+  #         cd "$REPO_COPY/tests/ci"
+  #         python3 unit_tests_check.py "$CHECK_NAME"
+  #     - name: Cleanup
+  #       if: always()
+  #       run: |
+  #         docker kill "$(docker ps -q)" ||:
+  #         docker rm -f "$(docker ps -a -q)" ||:
+  #         sudo rm -fr "$TEMP_PATH"
   UnitTestsTsan:
     needs: [BuilderDebTsan]
     runs-on: [self-hosted, fuzzer-unit-tester]
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index d93b17cbe79..c1ae4798716 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -375,50 +375,50 @@ jobs:
           docker kill "$(docker ps -q)" ||:
           docker rm -f "$(docker ps -a -q)" ||:
           sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
-  BuilderBinGCC:
-    needs: [DockerHubPush, FastTest]
-    runs-on: [self-hosted, builder]
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/build_check
-          IMAGES_PATH=${{runner.temp}}/images_path
-          REPO_COPY=${{runner.temp}}/build_check/ClickHouse
-          CACHES_PATH=${{runner.temp}}/../ccaches
-          CHECK_NAME=ClickHouse build check (actions)
-          BUILD_NAME=binary_gcc
-          EOF
-      - name: Download changed images
-        uses: actions/download-artifact@v2
-        with:
-          name: changed_images
-          path: ${{ runner.temp }}/images_path
-      - name: Clear repository
-        run: |
-          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Build
-        run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
-      - name: Upload build URLs to artifacts
-        if: ${{ success() || failure() }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.BUILD_URLS }}
-          path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
-      - name: Cleanup
-        if: always()
-        run: |
-          docker kill "$(docker ps -q)" ||:
-          docker rm -f "$(docker ps -a -q)" ||:
-          sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
+  # BuilderBinGCC:
+  #   needs: [DockerHubPush, FastTest]
+  #   runs-on: [self-hosted, builder]
+  #   steps:
+  #     - name: Set envs
+  #       run: |
+  #         cat >> "$GITHUB_ENV" << 'EOF'
+  #         TEMP_PATH=${{runner.temp}}/build_check
+  #         IMAGES_PATH=${{runner.temp}}/images_path
+  #         REPO_COPY=${{runner.temp}}/build_check/ClickHouse
+  #         CACHES_PATH=${{runner.temp}}/../ccaches
+  #         CHECK_NAME=ClickHouse build check (actions)
+  #         BUILD_NAME=binary_gcc
+  #         EOF
+  #     - name: Download changed images
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         name: changed_images
+  #         path: ${{ runner.temp }}/images_path
+  #     - name: Clear repository
+  #       run: |
+  #         sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+  #     - name: Check out repository code
+  #       uses: actions/checkout@v2
+  #     - name: Build
+  #       run: |
+  #         git -C "$GITHUB_WORKSPACE" submodule sync --recursive
+  #         git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+  #         sudo rm -fr "$TEMP_PATH"
+  #         mkdir -p "$TEMP_PATH"
+  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+  #         cd "$REPO_COPY/tests/ci" && python3 build_check.py "$CHECK_NAME" "$BUILD_NAME"
+  #     - name: Upload build URLs to artifacts
+  #       if: ${{ success() || failure() }}
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: ${{ env.BUILD_URLS }}
+  #         path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
+  #     - name: Cleanup
+  #       if: always()
+  #       run: |
+  #         docker kill "$(docker ps -q)" ||:
+  #         docker rm -f "$(docker ps -a -q)" ||:
+  #         sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
   BuilderDebAarch64:
     needs: [DockerHubPush, FastTest]
     runs-on: [self-hosted, builder]
@@ -1077,7 +1077,7 @@ jobs:
       - BuilderBinDarwin
       - BuilderBinDarwinAarch64
       - BuilderBinFreeBSD
-      - BuilderBinGCC
+      # - BuilderBinGCC
       - BuilderBinPPC64
       - BuilderBinTidy
       - BuilderDebSplitted
@@ -2886,40 +2886,40 @@ jobs:
           docker kill "$(docker ps -q)" ||:
           docker rm -f "$(docker ps -a -q)" ||:
           sudo rm -fr "$TEMP_PATH"
-  UnitTestsReleaseGCC:
-    needs: [BuilderBinGCC]
-    runs-on: [self-hosted, fuzzer-unit-tester]
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/unit_tests_asan
-          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Unit tests (release-gcc, actions)
-          REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v2
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Clear repository
-        run: |
-          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Unit test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 unit_tests_check.py "$CHECK_NAME"
-      - name: Cleanup
-        if: always()
-        run: |
-          docker kill "$(docker ps -q)" ||:
-          docker rm -f "$(docker ps -a -q)" ||:
-          sudo rm -fr "$TEMP_PATH"
+  # UnitTestsReleaseGCC:
+  #   needs: [BuilderBinGCC]
+  #   runs-on: [self-hosted, fuzzer-unit-tester]
+  #   steps:
+  #     - name: Set envs
+  #       run: |
+  #         cat >> "$GITHUB_ENV" << 'EOF'
+  #         TEMP_PATH=${{runner.temp}}/unit_tests_asan
+  #         REPORTS_PATH=${{runner.temp}}/reports_dir
+  #         CHECK_NAME=Unit tests (release-gcc, actions)
+  #         REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
+  #         EOF
+  #     - name: Download json reports
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         path: ${{ env.REPORTS_PATH }}
+  #     - name: Clear repository
+  #       run: |
+  #         sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+  #     - name: Check out repository code
+  #       uses: actions/checkout@v2
+  #     - name: Unit test
+  #       run: |
+  #         sudo rm -fr "$TEMP_PATH"
+  #         mkdir -p "$TEMP_PATH"
+  #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+  #         cd "$REPO_COPY/tests/ci"
+  #         python3 unit_tests_check.py "$CHECK_NAME"
+  #     - name: Cleanup
+  #       if: always()
+  #       run: |
+  #         docker kill "$(docker ps -q)" ||:
+  #         docker rm -f "$(docker ps -a -q)" ||:
+  #         sudo rm -fr "$TEMP_PATH"
   UnitTestsTsan:
     needs: [BuilderDebTsan]
     runs-on: [self-hosted, fuzzer-unit-tester]
diff --git a/.github/workflows/tags_stable.yml b/.github/workflows/tags_stable.yml
index 7a7eddf444d..9c55c619039 100644
--- a/.github/workflows/tags_stable.yml
+++ b/.github/workflows/tags_stable.yml
@@ -3,9 +3,14 @@ name: TagsStableWorkflow
 # - 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'
 
@@ -15,26 +20,36 @@ jobs:
     runs-on: [self-hosted, style-checker]
     steps:
     - name: Get tag name
-      run: echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
+      run: |
+        echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
     - name: Check out repository code
       uses: actions/checkout@v2
       with:
         ref: master
+        fetch-depth: 0
     - name: Generate versions
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        git fetch --tags
         ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
+        GID=$(id -d "${UID}")
+        docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 \
+            --volume="${GITHUB_WORKSPACE}:/ClickHouse" clickhouse/style-test \
+                /ClickHouse/utils/changelog/changelog.py -vv --gh-user-or-token="$GITHUB_TOKEN" \
+                --output="/ClickHouse/docs/changelogs/${GITHUB_TAG}.md" --jobs=5 "${GITHUB_TAG}"
+        git add "./docs/changelogs/${GITHUB_TAG}.md"
+        git diff HEAD
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v3
       with:
         author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
         committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
-        commit-message: Update version_date.tsv after ${{ env.GITHUB_TAG }}
+        commit-message: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
         branch: auto/${{ env.GITHUB_TAG }}
         delete-branch: true
-        title: Update version_date.tsv after ${{ env.GITHUB_TAG }}
+        title: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
         body: |
-          Update version_date.tsv after ${{ env.GITHUB_TAG }}
+          Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
 
-          Changelog category (leave one):
+          ### Changelog category (leave one):
           - Not for changelog (changelog entry is not required)
diff --git a/.gitmodules b/.gitmodules
index 6c9e66f9cbc..5fd9e9721f6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -262,3 +262,6 @@
 [submodule "contrib/minizip-ng"]
 	path = contrib/minizip-ng
 	url = https://github.com/zlib-ng/minizip-ng
+[submodule "contrib/wyhash"]
+	path = contrib/wyhash
+	url = https://github.com/wangyi-fudan/wyhash.git
diff --git a/benchmark/clickhouse/benchmark_cloud.sh b/benchmark/clickhouse/benchmark_cloud.sh
new file mode 100755
index 00000000000..01376e4009e
--- /dev/null
+++ b/benchmark/clickhouse/benchmark_cloud.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+QUERIES_FILE="queries.sql"
+TABLE=$1
+TRIES=3
+
+PARAMS="--host ... --secure --password ..."
+
+if [ -x ./clickhouse ]
+then
+    CLICKHOUSE_CLIENT="./clickhouse client"
+elif command -v clickhouse-client >/dev/null 2>&1
+then
+    CLICKHOUSE_CLIENT="clickhouse-client"
+else
+    echo "clickhouse-client is not found"
+    exit 1
+fi
+
+QUERY_ID_PREFIX="benchmark_$RANDOM"
+QUERY_NUM=1
+
+cat "$QUERIES_FILE" | sed "s/{table}/${TABLE}/g" | while read query
+    do
+    for i in $(seq 1 $TRIES)
+    do
+        QUERY_ID="${QUERY_ID_PREFIX}_${QUERY_NUM}_${i}"
+        ${CLICKHOUSE_CLIENT} ${PARAMS} --query_id "${QUERY_ID}" --format=Null --max_memory_usage=100G --query="$query"
+        echo -n '.'
+    done
+    QUERY_NUM=$((QUERY_NUM + 1))
+    echo
+done
+
+sleep 10
+
+${CLICKHOUSE_CLIENT} ${PARAMS} --query "
+    WITH extractGroups(query_id, '(\d+)_(\d+)\$') AS num_run, num_run[1]::UInt8 AS num, num_run[2]::UInt8 AS run
+    SELECT groupArrayInsertAt(query_duration_ms / 1000, (run - 1)::UInt8)::String || ','
+    FROM clusterAllReplicas(default, system.query_log)
+    WHERE event_date >= yesterday() AND type = 2 AND query_id LIKE '${QUERY_ID_PREFIX}%'
+    GROUP BY num ORDER BY num FORMAT TSV
+"
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 1f03c0fd341..94003f3b3ee 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -94,6 +94,7 @@ if (ENABLE_FUZZING)
     add_contrib (libprotobuf-mutator-cmake libprotobuf-mutator)
 endif()
 
+add_contrib (wyhash-cmake wyhash)
 add_contrib (cityhash102)
 add_contrib (libfarmhash)
 add_contrib (icu-cmake icu)
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
index 2e4059efc17..a4574493440 100644
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@@ -364,10 +364,8 @@ SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_snappy.cc" ${ARROW_SRCS})
 add_definitions(-DARROW_WITH_ZLIB)
 SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zlib.cc" ${ARROW_SRCS})
 
-if (ARROW_WITH_ZSTD)
-    add_definitions(-DARROW_WITH_ZSTD)
-    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
-endif ()
+add_definitions(-DARROW_WITH_ZSTD)
+SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
 
 
 add_library(_arrow ${ARROW_SRCS})
@@ -383,7 +381,6 @@ target_link_libraries(_arrow PRIVATE
     ch_contrib::snappy
     ch_contrib::zlib
     ch_contrib::zstd
-    ch_contrib::zstd
 )
 target_link_libraries(_arrow PUBLIC _orc)
 
diff --git a/contrib/wyhash b/contrib/wyhash
new file mode 160000
index 00000000000..991aa3dab62
--- /dev/null
+++ b/contrib/wyhash
@@ -0,0 +1 @@
+Subproject commit 991aa3dab624e50b066f7a02ccc9f6935cc740ec
diff --git a/contrib/wyhash-cmake/CMakeLists.txt b/contrib/wyhash-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..679346d601a
--- /dev/null
+++ b/contrib/wyhash-cmake/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(wyhash INTERFACE)
+target_include_directories(wyhash SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/wyhash")
+add_library(ch_contrib::wyhash ALIAS wyhash)
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index d9a5bb23a80..c547ae03a52 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -176,6 +176,7 @@ function clone_submodules
             contrib/NuRaft
             contrib/jemalloc
             contrib/replxx
+            contrib/wyhash
         )
 
         git submodule sync
diff --git a/docker/test/integration/runner/dockerd-entrypoint.sh b/docker/test/integration/runner/dockerd-entrypoint.sh
index 34414abc3f5..0cb25d12a9f 100755
--- a/docker/test/integration/runner/dockerd-entrypoint.sh
+++ b/docker/test/integration/runner/dockerd-entrypoint.sh
@@ -28,8 +28,11 @@ done
 set -e
 
 # cleanup for retry run if volume is not recreated
-docker kill "$(docker ps -aq)" || true
-docker rm "$(docker ps -aq)" || true
+# shellcheck disable=SC2046
+{
+  docker kill $(docker ps -aq) || true
+  docker rm $(docker ps -aq) || true
+}
 
 echo "Start tests"
 export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 0ba4f0edc21..97b9225a2d2 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -101,7 +101,12 @@ EOL
 
 function stop()
 {
-    clickhouse stop
+    clickhouse stop --do-not-kill && return
+    # We failed to stop the server with SIGTERM. Maybe it hang, let's collect stacktraces.
+    kill -TERM "$(pidof gdb)" ||:
+    sleep 5
+    gdb -batch -ex 'thread apply all backtrace' -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" ||:
+    clickhouse stop --force
 }
 
 function start()
@@ -198,10 +203,14 @@ clickhouse-client --query "SHOW TABLES FROM test"
 stop
 mv /var/log/clickhouse-server/clickhouse-server.log /var/log/clickhouse-server/clickhouse-server.stress.log
 
+# NOTE Disable thread fuzzer before server start with data after stress test.
+# In debug build it can take a lot of time.
+unset "${!THREAD_@}"
+
 start
 
 clickhouse-client --query "SELECT 'Server successfully started', 'OK'" >> /test_output/test_results.tsv \
-                       || (echo -e 'Server failed to start (see application_errors.txt)\tFAIL' >> /test_output/test_results.tsv \
+                       || (echo -e 'Server failed to start (see application_errors.txt and clickhouse-server.clean.log)\tFAIL' >> /test_output/test_results.tsv \
                        && grep -Fa "<Error>.*Application" /var/log/clickhouse-server/clickhouse-server.log > /test_output/application_errors.txt)
 
 [ -f /var/log/clickhouse-server/clickhouse-server.log ] || echo -e "Server log does not exist\tFAIL"
@@ -387,7 +396,7 @@ for table in query_log trace_log; do
 done
 
 # Write check result into check_status.tsv
-clickhouse-local --structure "test String, res String" -q "SELECT 'failure', test FROM table WHERE res != 'OK' order by (lower(test) like '%hung%') LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv
+clickhouse-local --structure "test String, res String" -q "SELECT 'failure', test FROM table WHERE res != 'OK' order by (lower(test) like '%hung%'), rowNumberInAllBlocks() LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv
 [ -s /test_output/check_status.tsv ] || echo -e "success\tNo errors found" > /test_output/check_status.tsv
 
 # Core dumps (see gcore)
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index 3101ab84c40..427010dbe37 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     libxml2-utils \
     moreutils \
     pylint \
+    python3-fuzzywuzzy \
     python3-pip \
     shellcheck \
     yamllint \
diff --git a/docker/test/style/run.sh b/docker/test/style/run.sh
index 651883511e8..67870eb3234 100755
--- a/docker/test/style/run.sh
+++ b/docker/test/style/run.sh
@@ -18,3 +18,6 @@ echo "Check workflows" | ts
 echo "Check shell scripts with shellcheck" | ts
 ./shellcheck-run.sh           |& tee /test_output/shellcheck_output.txt
 /process_style_check_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+echo "Check help for changelog generator works" | ts
+cd ../changelog || exit 1
+./changelog.py -h 2>/dev/null 1>&2
diff --git a/docker/test/util/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
index dadda55c830..687c03697d7 100755
--- a/docker/test/util/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -12,7 +12,7 @@ UNKNOWN_SIGN = "[ UNKNOWN "
 SKIPPED_SIGN = "[ SKIPPED "
 HUNG_SIGN = "Found hung queries in processlist"
 
-NO_TASK_TIMEOUT_SIGNS = ["All tests have finished", "No tests were run"]
+SUCCESS_FINISH_SIGNS = ["All tests have finished", "No tests were run"]
 
 RETRIES_SIGN = "Some tests were restarted"
 
@@ -25,14 +25,14 @@ def process_test_log(log_path):
     success = 0
     hung = False
     retries = False
-    task_timeout = True
+    success_finish = False
     test_results = []
     with open(log_path, "r") as test_file:
         for line in test_file:
             original_line = line
             line = line.strip()
-            if any(s in line for s in NO_TASK_TIMEOUT_SIGNS):
-                task_timeout = False
+            if any(s in line for s in SUCCESS_FINISH_SIGNS):
+                success_finish = True
             if HUNG_SIGN in line:
                 hung = True
             if RETRIES_SIGN in line:
@@ -81,7 +81,7 @@ def process_test_log(log_path):
         failed,
         success,
         hung,
-        task_timeout,
+        success_finish,
         retries,
         test_results,
     )
@@ -108,7 +108,7 @@ def process_result(result_path):
             failed,
             success,
             hung,
-            task_timeout,
+            success_finish,
             retries,
             test_results,
         ) = process_test_log(result_path)
@@ -123,10 +123,10 @@ def process_result(result_path):
             description = "Some queries hung, "
             state = "failure"
             test_results.append(("Some queries hung", "FAIL", "0", ""))
-        elif task_timeout:
-            description = "Timeout, "
+        elif not success_finish:
+            description = "Tests are not finished, "
             state = "failure"
-            test_results.append(("Timeout", "FAIL", "0", ""))
+            test_results.append(("Tests are not finished", "FAIL", "0", ""))
         elif retries:
             description = "Some tests restarted, "
             test_results.append(("Some tests restarted", "SKIPPED", "0", ""))
diff --git a/docs/changelogs/v22.1.1.2542-prestable.md b/docs/changelogs/v22.1.1.2542-prestable.md
new file mode 100644
index 00000000000..b552da5cfb8
--- /dev/null
+++ b/docs/changelogs/v22.1.1.2542-prestable.md
@@ -0,0 +1,217 @@
+### ClickHouse release v22.1.1.2542-prestable FIXME as compared to v21.12.1.9017-prestable
+
+#### Backward Incompatible Change
+* Change ZooKeeper path for zero-copy marks for shared data. Fix for remove marks in ZooKeeper for renamed parts. [#32061](https://github.com/ClickHouse/ClickHouse/pull/32061) ([ianton-ru](https://github.com/ianton-ru)).
+* - Account for scalar subqueries. With this change, rows read in scalar subqueries are now reported in the query_log. If the scalar subquery is cached (repeated or called for several rows) the rows read are only counted once. This change allows KILLing queries and reporting progress while they are executing scalar subqueries. [#32271](https://github.com/ClickHouse/ClickHouse/pull/32271) ([Raúl Marín](https://github.com/Algunenano)).
+* Add `left`, `right`, `leftUTF8`, `rightUTF8` functions. Fix error in implementation of `substringUTF8` function with negative offset (offset from the end of string). The functions `left` and `right` were previously implemented in parser. Upgrade notes: distributed queries with `left` or `right` functions without aliases may throw exception if cluster contains different versions of clickhouse-server. If you are upgrading your cluster and encounter this error, you should finish upgrading your cluster to ensure all nodes have the same version. Also you can add aliases (`AS something`) to the columns in your queries to avoid this issue. [#33407](https://github.com/ClickHouse/ClickHouse/pull/33407) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+* Implemented sparse serialization. It can reduce usage of disk space and improve performance of some queries for columns, which contain a lot of default (zero) values. It can be enabled by setting `ratio_for_sparse_serialization`. Sparse serialization will be chosen dynamically for column, if it has ratio of number of default values to number of all values above that threshold. Serialization (default or sparse) will be fixed for every column in part, but may varies between parts. [#22535](https://github.com/ClickHouse/ClickHouse/pull/22535) ([Anton Popov](https://github.com/CurtizJ)).
+* add grouping sets function, like GROUP BY grouping sets (a, b, (a, b)). [#26869](https://github.com/ClickHouse/ClickHouse/pull/26869) ([taylor12805](https://github.com/taylor12805)).
+* Added an ability to read from all replicas within a shard during distributed query. To enable this, set `allow_experimental_parallel_reading_from_replicas=true` and `max_parallel_replicas` to any number. This closes [#26748](https://github.com/ClickHouse/ClickHouse/issues/26748). [#29279](https://github.com/ClickHouse/ClickHouse/pull/29279) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Start and stop servers when hosts and ports configuration changes. [#30549](https://github.com/ClickHouse/ClickHouse/pull/30549) ([Kevin Michel](https://github.com/kmichel-aiven)).
+* Create any kind of view with comment. ... [#31062](https://github.com/ClickHouse/ClickHouse/pull/31062) ([Vasily Nemkov](https://github.com/Enmk)).
+* Implement hive table engine to access apache hive from clickhouse. Related RFC: [#29245](https://github.com/ClickHouse/ClickHouse/issues/29245). [#31104](https://github.com/ClickHouse/ClickHouse/pull/31104) ([李扬](https://github.com/taiyang-li)).
+* * Automatic cluster discovery via Zoo/Keeper. [#31442](https://github.com/ClickHouse/ClickHouse/pull/31442) ([Vladimir C](https://github.com/vdimir)).
+* Adding support for disks backed by Azure Blob Storage, in a similar way it has been done for disks backed by AWS S3. Current implementation allows for all the basic disk operations. [#31505](https://github.com/ClickHouse/ClickHouse/pull/31505) ([Jakub Kuklis](https://github.com/jkuklis)).
+* * Add "TABLE OVERRIDE" feature for customizing MaterializedMySQL table schemas. [#32325](https://github.com/ClickHouse/ClickHouse/pull/32325) ([Stig Bakken](https://github.com/stigsb)).
+* Implement data schema inference for input formats. Allow to skip structure (or write just `auto`) in table functions `file`, `url`, `s3`, `hdfs` and in parameters of `clickhouse-local` . Allow to skip structure in create query for table engines `File`, `HDFS`, `S3`, `URL`, `Merge`, `Buffer`, `Distributed` and `ReplicatedMergeTree` (if we add new replicas). [#32455](https://github.com/ClickHouse/ClickHouse/pull/32455) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support TABLE OVERRIDE clause for MaterializedPostgreSQL. RFC: [#31480](https://github.com/ClickHouse/ClickHouse/issues/31480). [#32749](https://github.com/ClickHouse/ClickHouse/pull/32749) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add `EXPLAIN TABLE OVERRIDE` query. [#32836](https://github.com/ClickHouse/ClickHouse/pull/32836) ([Stig Bakken](https://github.com/stigsb)).
+* If an invalid setting is defined using the `SET` query or using the query parameters in the HTTP request, error message will contain suggestions that are similar to the invalid setting string (if any exists). [#32946](https://github.com/ClickHouse/ClickHouse/pull/32946) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add aggregate functions `cramersV`, `cramersVBiasCorrected`, `theilsU` and `contingency`. These functions calculate dependency (measure of association) between categorial values. All these functions are using cross-tab (histogram on pairs) for implementation. You can imagine it like a correlation coefficient but for any discrete values (not necessary numbers). [#33366](https://github.com/ClickHouse/ClickHouse/pull/33366) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Added function `arrayLast`. Closes [#33390](https://github.com/ClickHouse/ClickHouse/issues/33390). [#33415](https://github.com/ClickHouse/ClickHouse/pull/33415) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add MONTHNAME function. [#33436](https://github.com/ClickHouse/ClickHouse/pull/33436) ([usurai](https://github.com/usurai)).
+* Auto detect file extension. Close [#30918](https://github.com/ClickHouse/ClickHouse/issues/30918). [#33443](https://github.com/ClickHouse/ClickHouse/pull/33443) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Added function `arrayLastIndex`. [#33465](https://github.com/ClickHouse/ClickHouse/pull/33465) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add new h3 miscellaneous functions: `h3DegsToRads`, `h3RadsToDegs`, `h3HexAreaKm2`, `h3CellAreaM2`, `h3CellAreaRads2`. [#33479](https://github.com/ClickHouse/ClickHouse/pull/33479) ([Bharat Nallan](https://github.com/bharatnc)).
+* Detect format by file extension in file/hdfs/s3/url table functions and HDFS/S3/URL table engines. [#33565](https://github.com/ClickHouse/ClickHouse/pull/33565) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Performance Improvement
+* Non significant change. In extremely rare cases when data part is lost on every replica, after merging of some data parts, the subsequent queries may skip less amount of partitions during partition pruning. This hardly affects anything. [#32220](https://github.com/ClickHouse/ClickHouse/pull/32220) ([Azat Khuzhin](https://github.com/azat)).
+* Slight performance improvement of `reinterpret` function. [#32587](https://github.com/ClickHouse/ClickHouse/pull/32587) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Reduce allocated memory for dictionaries with string attributes. [#33466](https://github.com/ClickHouse/ClickHouse/pull/33466) ([Maksim Kita](https://github.com/kitaisreal)).
+* Avoid exponential backtracking in parser. This closes [#20158](https://github.com/ClickHouse/ClickHouse/issues/20158). [#33481](https://github.com/ClickHouse/ClickHouse/pull/33481) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Improvement
+* Now date time conversion functions that generates time before 1970-01-01 00:00:00 will be saturated to zero instead of overflow. [#29953](https://github.com/ClickHouse/ClickHouse/pull/29953) ([Amos Bird](https://github.com/amosbird)).
+* Added settings `command_read_timeout`, `command_write_timeout` for `StorageExecutable`, `StorageExecutablePool`, `ExecutableDictionary`, `ExecutablePoolDictionary`, `ExecutableUserDefinedFunctions`. Setting `command_read_timeout` controls timeout for reading data from command stdout in milliseconds. Setting `command_write_timeout` timeout for writing data to command stdin in milliseconds. Added settings `command_termination_timeout` for `ExecutableUserDefinedFunction`, `ExecutableDictionary`, `StorageExecutable`. Added setting `execute_direct` for `ExecutableUserDefinedFunction`, by default true. Added setting `execute_direct` for `ExecutableDictionary`, `ExecutablePoolDictionary`, by default false. [#30957](https://github.com/ClickHouse/ClickHouse/pull/30957) ([Maksim Kita](https://github.com/kitaisreal)).
+* Optimize single part projection materialization. This closes [#31669](https://github.com/ClickHouse/ClickHouse/issues/31669). [#31885](https://github.com/ClickHouse/ClickHouse/pull/31885) ([Amos Bird](https://github.com/amosbird)).
+* Enable comparison between `Decimal` and `Float`. Closes [#22626](https://github.com/ClickHouse/ClickHouse/issues/22626). [#31966](https://github.com/ClickHouse/ClickHouse/pull/31966) ([flynn](https://github.com/ucasfl)).
+* - Ignore parse failure of opentelemetry's `traceparent` header. [#32116](https://github.com/ClickHouse/ClickHouse/pull/32116) ([Frank Chen](https://github.com/FrankChen021)).
+* Improve keeper writing performance by optimization the size calculation logic. [#32366](https://github.com/ClickHouse/ClickHouse/pull/32366) ([zhanglistar](https://github.com/zhanglistar)).
+* Allows to connect to mongodb 5.0. Closes [#31483](https://github.com/ClickHouse/ClickHouse/issues/31483),. [#32416](https://github.com/ClickHouse/ClickHouse/pull/32416) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disable some optimizations for window functions. Closes [#31535](https://github.com/ClickHouse/ClickHouse/issues/31535). Closes [#31620](https://github.com/ClickHouse/ClickHouse/issues/31620). [#32453](https://github.com/ClickHouse/ClickHouse/pull/32453) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow empty credentials for mongo engine. Closes [#26267](https://github.com/ClickHouse/ClickHouse/issues/26267). [#32460](https://github.com/ClickHouse/ClickHouse/pull/32460) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improve handling nested structures with missing columns while reading protobuf. Follow-up to https://github.com/ClickHouse/ClickHouse/pull/31988. [#32531](https://github.com/ClickHouse/ClickHouse/pull/32531) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Events clause support for window view watch query. [#32607](https://github.com/ClickHouse/ClickHouse/pull/32607) ([vxider](https://github.com/Vxider)).
+* Add settings `max_concurrent_select_queries` and `max_concurrent_insert_queries` for control concurrent queries by query kind. Close [#3575](https://github.com/ClickHouse/ClickHouse/issues/3575). [#32609](https://github.com/ClickHouse/ClickHouse/pull/32609) ([SuperDJY](https://github.com/cmsxbc)).
+* support Date32 for `genarateRandom` engine. [#32643](https://github.com/ClickHouse/ClickHouse/pull/32643) ([nauta](https://github.com/nautaa)).
+* Support authSource option for storage MongoDB. Closes [#32594](https://github.com/ClickHouse/ClickHouse/issues/32594). [#32702](https://github.com/ClickHouse/ClickHouse/pull/32702) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow to control connection timeouts for mysql (previously was supported only for dictionary source). Closes [#16669](https://github.com/ClickHouse/ClickHouse/issues/16669). Previously default connect_timeout was rather small, now it is configurable. [#32734](https://github.com/ClickHouse/ClickHouse/pull/32734) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Flush all In-Memory data parts when WAL is not enabled while shutdown server or detaching table. [#32742](https://github.com/ClickHouse/ClickHouse/pull/32742) ([nauta](https://github.com/nautaa)).
+* Improve gRPC compression support for [#28671](https://github.com/ClickHouse/ClickHouse/issues/28671). [#32747](https://github.com/ClickHouse/ClickHouse/pull/32747) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Added support for specifying subquery as SQL user defined function. Example: `CREATE FUNCTION test AS () -> (SELECT 1)`. Closes [#30755](https://github.com/ClickHouse/ClickHouse/issues/30755). [#32758](https://github.com/ClickHouse/ClickHouse/pull/32758) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support hints for clickhouse-client and clickhouse-local. Closes [#32237](https://github.com/ClickHouse/ClickHouse/issues/32237),. [#32841](https://github.com/ClickHouse/ClickHouse/pull/32841) ([凌涛](https://github.com/lingtaolf)).
+* - Do not prepend THREADS_COUNT with -j to avoid additional prepending in subprocesses. [#32844](https://github.com/ClickHouse/ClickHouse/pull/32844) ([Ernest Zaslavsky](https://github.com/kreuzerkrieg)).
+* Added support for `BIT` data type in `MaterializedMySQL`. Closes [#15182](https://github.com/ClickHouse/ClickHouse/issues/15182), [#32233](https://github.com/ClickHouse/ClickHouse/issues/32233). [#32900](https://github.com/ClickHouse/ClickHouse/pull/32900) ([zzsmdfj](https://github.com/zzsmdfj)).
+* More efficient handling of globs for url storage. Closes [#32866](https://github.com/ClickHouse/ClickHouse/issues/32866). [#32907](https://github.com/ClickHouse/ClickHouse/pull/32907) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* This only happens in unofficial builds. Fixed segfault when inserting data into compressed Decimal, String, FixedString and Array columns. This closes [#32939](https://github.com/ClickHouse/ClickHouse/issues/32939). [#32940](https://github.com/ClickHouse/ClickHouse/pull/32940) ([N. Kolotov](https://github.com/nkolotov)).
+* Dictionaries added `Date32` date type support. Closes [#32913](https://github.com/ClickHouse/ClickHouse/issues/32913). [#32971](https://github.com/ClickHouse/ClickHouse/pull/32971) ([Maksim Kita](https://github.com/kitaisreal)).
+* Short circuit evaluation function `throwIf` support. Closes [#32969](https://github.com/ClickHouse/ClickHouse/issues/32969). [#32973](https://github.com/ClickHouse/ClickHouse/pull/32973) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improve Bool type serialization and deserialization. [#32984](https://github.com/ClickHouse/ClickHouse/pull/32984) ([Kruglov Pavel](https://github.com/Avogar)).
+* Send profile info in clickhouse-local. Closes [#33093](https://github.com/ClickHouse/ClickHouse/issues/33093). [#33097](https://github.com/ClickHouse/ClickHouse/pull/33097) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Inject git information into clickhouse binary file. So we can get source code revision easily from clickhouse binary file. [#33124](https://github.com/ClickHouse/ClickHouse/pull/33124) ([李扬](https://github.com/taiyang-li)).
+* Validate config keys for external dictionaries. [#33095](https://github.com/ClickHouse/ClickHouse/issues/33095)#issuecomment-1000577517. [#33130](https://github.com/ClickHouse/ClickHouse/pull/33130) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add retry for Postgres connect in case nothing has been fetched yet. Closes [#33199](https://github.com/ClickHouse/ClickHouse/issues/33199). [#33209](https://github.com/ClickHouse/ClickHouse/pull/33209) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Correctly prevent nullable primary keys if necessary. This is for [#32780](https://github.com/ClickHouse/ClickHouse/issues/32780). [#33218](https://github.com/ClickHouse/ClickHouse/pull/33218) ([Amos Bird](https://github.com/amosbird)).
+* If storage supports SETTINGS allow to pass them as key value or via config. Add this support for mysql. [#33231](https://github.com/ClickHouse/ClickHouse/pull/33231) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow to cancel formats Arrow / Parquet / ORC which failed to be cancelled it case of big files and setting input_format_allow_seeks as false. Closes [#29678](https://github.com/ClickHouse/ClickHouse/issues/29678). [#33238](https://github.com/ClickHouse/ClickHouse/pull/33238) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Always display resource usage (total CPU usage, total RAM usage and max RAM usage per host) in client. [#33271](https://github.com/ClickHouse/ClickHouse/pull/33271) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* parseDateTimeBestEffort support Unix Timestamp with Milliseconds. [#33276](https://github.com/ClickHouse/ClickHouse/pull/33276) ([Ben](https://github.com/benbiti)).
+* Support moving conditions to `PREWHERE` (setting `optimize_move_to_prewhere`) for tables of `Merge` engine if its all underlying tables supports `PREWHERE`. [#33300](https://github.com/ClickHouse/ClickHouse/pull/33300) ([Anton Popov](https://github.com/CurtizJ)).
+* Pressing Ctrl+C twice will terminate `clickhouse-benchmark` immediately without waiting for in-flight queries. This closes [#32586](https://github.com/ClickHouse/ClickHouse/issues/32586). [#33303](https://github.com/ClickHouse/ClickHouse/pull/33303) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* support `<secure/>` in cluster configuration. Close [#33270](https://github.com/ClickHouse/ClickHouse/issues/33270). [#33330](https://github.com/ClickHouse/ClickHouse/pull/33330) ([SuperDJY](https://github.com/cmsxbc)).
+* `LineAsString` can be used as output format. This closes [#30919](https://github.com/ClickHouse/ClickHouse/issues/30919). [#33331](https://github.com/ClickHouse/ClickHouse/pull/33331) ([Sergei Trifonov](https://github.com/serxa)).
+* Allow negative intervals in function `intervalLengthSum`. Their length will be added as well. This closes [#33323](https://github.com/ClickHouse/ClickHouse/issues/33323). [#33335](https://github.com/ClickHouse/ClickHouse/pull/33335) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* clickhouse-local: track memory under --max_memory_usage_in_client option. [#33341](https://github.com/ClickHouse/ClickHouse/pull/33341) ([Azat Khuzhin](https://github.com/azat)).
+* Make installation script working on FreeBSD. This closes [#33384](https://github.com/ClickHouse/ClickHouse/issues/33384). [#33418](https://github.com/ClickHouse/ClickHouse/pull/33418) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add some building options in system.build_options. [#33431](https://github.com/ClickHouse/ClickHouse/pull/33431) ([李扬](https://github.com/taiyang-li)).
+* Abuse of `untuple` function was leading to exponential complexity of query analysis (found by fuzzer). This closes [#33297](https://github.com/ClickHouse/ClickHouse/issues/33297). [#33445](https://github.com/ClickHouse/ClickHouse/pull/33445) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add config to enable ipv4 or ipv6. This close [#33381](https://github.com/ClickHouse/ClickHouse/issues/33381). [#33450](https://github.com/ClickHouse/ClickHouse/pull/33450) ([Wu Xueyang](https://github.com/wuxueyang96)).
+* add function decodeURLFormComponent. Close [#10298](https://github.com/ClickHouse/ClickHouse/issues/10298). [#33451](https://github.com/ClickHouse/ClickHouse/pull/33451) ([SuperDJY](https://github.com/cmsxbc)).
+* Implement Materialized view `getVirtuals` function. Close [#11210](https://github.com/ClickHouse/ClickHouse/issues/11210). [#33482](https://github.com/ClickHouse/ClickHouse/pull/33482) ([zhongyuankai](https://github.com/zhongyuankai)).
+
+#### Bug Fix
+* Quota limit was not reached, but the limit was exceeded. This PR fixes [#31174](https://github.com/ClickHouse/ClickHouse/issues/31174). [#31656](https://github.com/ClickHouse/ClickHouse/pull/31656) ([sunny](https://github.com/sunny19930321)).
+* - Clickhouse Keeper handler should remove operation when response sent. [#32988](https://github.com/ClickHouse/ClickHouse/pull/32988) ([JackyWoo](https://github.com/JackyWoo)).
+* Fix null pointer dereference in low cardinality data when deserializing LowCardinality data in the Native format. [#33021](https://github.com/ClickHouse/ClickHouse/pull/33021) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Specifically crafted input data for `Native` format may lead to reading uninitialized memory or crash. This is relevant if `clickhouse-server` is open for write access to adversary. [#33050](https://github.com/ClickHouse/ClickHouse/pull/33050) ([Heena Bansal](https://github.com/HeenaBansal2009)).
+
+#### Build/Testing/Packaging Improvement
+* - Add arm64 packages - Stream python logs in realtime with `PYTHONUNBUFFERED=1` - Fix building docker images in docker/packager/packager script. [#32415](https://github.com/ClickHouse/ClickHouse/pull/32415) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Terminate build when linker path not found. [#32437](https://github.com/ClickHouse/ClickHouse/pull/32437) ([JackyWoo](https://github.com/JackyWoo)).
+* - Create a global ENV per job - Clean CCACHE after a build is over. [#32478](https://github.com/ClickHouse/ClickHouse/pull/32478) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* PENDING (Should mention submodule updates and versions). [#32484](https://github.com/ClickHouse/ClickHouse/pull/32484) ([Raúl Marín](https://github.com/Algunenano)).
+* Remove readline support. [#32574](https://github.com/ClickHouse/ClickHouse/pull/32574) ([Azat Khuzhin](https://github.com/azat)).
+* Fix build issue related to azure blob storage. [#32788](https://github.com/ClickHouse/ClickHouse/pull/32788) ([Amos Bird](https://github.com/amosbird)).
+* - Unify init scripts for every worker runner type - Install pigz in AMI. [#32800](https://github.com/ClickHouse/ClickHouse/pull/32800) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Use all available in container processors for PVS studio check and fast tests. Delete coverage image. [#32854](https://github.com/ClickHouse/ClickHouse/pull/32854) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Rename main to pull_request - Add BuilderDebAarch64 to all workflows - Use docker buildkit, save building cache to docker hub and reuse it - Build x86_64 and arm64 docker images separately, then merge them together to a multi-architecture manifest - Tune many docker images to being multi-architecture - Use the images from the current PR/commit in the following dependent builds - Upgrade mysql client in stateless-tests image - Add functional tests for aarch64 for PR actions (forced green for a while) - Add python typing to some scripts - Add docker buildkit to runners' init script - Add func-tester-aarch64 runners - Use `docker login --password-stdin` to not expose password on exception. [#32911](https://github.com/ClickHouse/ClickHouse/pull/32911) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Enable hermetic build for shared builds. This is mainly for developers. [#32968](https://github.com/ClickHouse/ClickHouse/pull/32968) ([Amos Bird](https://github.com/amosbird)).
+* Prepare ClickHouse to be built with musl-libc. It is not enabled by default. [#33134](https://github.com/ClickHouse/ClickHouse/pull/33134) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a simple tool to visualize flaky tests in web browser. [#33185](https://github.com/ClickHouse/ClickHouse/pull/33185) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Avoid strict checking when `ENABLE_AZURE_BLOB_STORAGE = 0`. https://github.com/ClickHouse/ClickHouse/pull/32948#discussion_r773168611 cc @nikitamikhaylov. [#33219](https://github.com/ClickHouse/ClickHouse/pull/33219) ([Amos Bird](https://github.com/amosbird)).
+* Add more tests for the nullable primary key feature. Add more tests with different types and merge tree kinds, plus randomly generated data. [#33228](https://github.com/ClickHouse/ClickHouse/pull/33228) ([Amos Bird](https://github.com/amosbird)).
+* Don't use particular encoding for diff-strings, it may contain multiple different encodings. [#33336](https://github.com/ClickHouse/ClickHouse/pull/33336) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Avoid strict checking when ENABLE_AZURE_BLOB_STORAGE = 0. This is another try on behalf of https://github.com/ClickHouse/ClickHouse/pull/33219 , which was reverted likely due to CI issues. [#33346](https://github.com/ClickHouse/ClickHouse/pull/33346) ([Amos Bird](https://github.com/amosbird)).
+* During migration from Yandex to github actions we've lost static links to the latest master ([doc](https://clickhouse.com/docs/en/getting-started/install/#from-single-binary)) It solves issue [#33480](https://github.com/ClickHouse/ClickHouse/issues/33480) partially. [#33559](https://github.com/ClickHouse/ClickHouse/pull/33559) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Restore a lost description checking. [#33591](https://github.com/ClickHouse/ClickHouse/pull/33591) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add `actionlint` for workflows and verify workflow files via `act --list` to check the correct workflow syntax. [#33612](https://github.com/ClickHouse/ClickHouse/pull/33612) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Remove editing /etc/hosts from Dockerfile. [#33635](https://github.com/ClickHouse/ClickHouse/pull/33635) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Properly separate thrift-cmake from arrow-cmake after https://github.com/ClickHouse/ClickHouse/pull/31104 . cc @taiyang-li. [#33661](https://github.com/ClickHouse/ClickHouse/pull/33661) ([Amos Bird](https://github.com/amosbird)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Fixed CAST from String to IPv4 or IPv6 and back. Fixed error message in case of failed conversion. [#29224](https://github.com/ClickHouse/ClickHouse/pull/29224) ([Dmitry Novik](https://github.com/novikd)).
+* Fix base64Encode adding trailing bytes on small strings. [#31797](https://github.com/ClickHouse/ClickHouse/pull/31797) ([Kevin Michel](https://github.com/kmichel-aiven)).
+* Fix unexpected projection removal when detaching parts. [#32067](https://github.com/ClickHouse/ClickHouse/pull/32067) ([Amos Bird](https://github.com/amosbird)).
+* Fix 'APPLY lambda' parsing which could lead to client/server crash. [#32138](https://github.com/ClickHouse/ClickHouse/pull/32138) ([Kruglov Pavel](https://github.com/Avogar)).
+* Some replication queue entries might hang for `temporary_directories_lifetime` (1 day by default) with `Directory tmp_merge_<part_name>` or `Part ... (state Deleting) already exists, but it will be deleted soon` or similar error. It's fixed. Fixes [#29616](https://github.com/ClickHouse/ClickHouse/issues/29616). [#32201](https://github.com/ClickHouse/ClickHouse/pull/32201) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix unix timestamp Millisecond convert to DateTime64, fractional part calc reversed. [#32240](https://github.com/ClickHouse/ClickHouse/pull/32240) ([Ben](https://github.com/benbiti)).
+* Fix broken select query when there are more than 2 row policies on same column, begin at second queries on the same session. [#31606](https://github.com/ClickHouse/ClickHouse/issues/31606). [#32291](https://github.com/ClickHouse/ClickHouse/pull/32291) ([SuperDJY](https://github.com/cmsxbc)).
+* Fix failures in queries that are trying to use skipping indices, which are not materialized yet. Fixes [#32292](https://github.com/ClickHouse/ClickHouse/issues/32292) and [#30343](https://github.com/ClickHouse/ClickHouse/issues/30343). [#32359](https://github.com/ClickHouse/ClickHouse/pull/32359) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix issue with ambiguous query formatting in distributed queries that led to errors when some table columns were named ALL or DISTINCT. This closes [#32391](https://github.com/ClickHouse/ClickHouse/issues/32391). [#32490](https://github.com/ClickHouse/ClickHouse/pull/32490) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The Proper handle of the case with apache arrow column duplication. [#32507](https://github.com/ClickHouse/ClickHouse/pull/32507) ([Dmitriy Mokhnatkin](https://github.com/DMokhnatkin)).
+* Fix crash in `JoinCommon::removeColumnNullability`, close [#32458](https://github.com/ClickHouse/ClickHouse/issues/32458). [#32508](https://github.com/ClickHouse/ClickHouse/pull/32508) ([Vladimir C](https://github.com/vdimir)).
+* fix groupBitmapAnd function on distributed table. [#32529](https://github.com/ClickHouse/ClickHouse/pull/32529) ([minhthucdao](https://github.com/dmthuc)).
+* Fix async inserts with formats CustomSeparated, Template, Regexp, MsgPack and JSONAsString. Previousely async inserts with these formats didn't read any data. [#32530](https://github.com/ClickHouse/ClickHouse/pull/32530) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix sparse_hashed dict performance with sequential keys (wrong hash function). [#32536](https://github.com/ClickHouse/ClickHouse/pull/32536) ([Azat Khuzhin](https://github.com/azat)).
+* Fix table lifetime (i.e. possible use-after-free) in case of parallel DROP TABLE and INSERT. [#32572](https://github.com/ClickHouse/ClickHouse/pull/32572) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible exception at RabbitMQ storage startup by delaying channel creation. [#32584](https://github.com/ClickHouse/ClickHouse/pull/32584) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix surprisingly bad code in function `file`. [#32640](https://github.com/ClickHouse/ClickHouse/pull/32640) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* close [#32504](https://github.com/ClickHouse/ClickHouse/issues/32504). [#32649](https://github.com/ClickHouse/ClickHouse/pull/32649) ([Vladimir C](https://github.com/vdimir)).
+* Fix LOGICAL_ERROR when the target of a materialized view is a JOIN or a SET table. [#32669](https://github.com/ClickHouse/ClickHouse/pull/32669) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix `optimize_read_in_order` optimization in case when table engine is `Distributed` or `Merge` and its underlying `MergeTree` tables have monotonous function in prefix of sorting key. [#32670](https://github.com/ClickHouse/ClickHouse/pull/32670) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix `ALTER TABLE ... MATERIALIZE TTL` query with `TTL ... DELETE WHERE ...` and `TTL ... GROUP BY ...` modes. [#32695](https://github.com/ClickHouse/ClickHouse/pull/32695) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix error `Column is not under aggregate function` in case of MV with `GROUP BY (list of columns)` (which is pared as `GROUP BY tuple(...)`) over Kafka/RabbitMQ. Fixes [#32668](https://github.com/ClickHouse/ClickHouse/issues/32668) and [#32744](https://github.com/ClickHouse/ClickHouse/issues/32744). [#32751](https://github.com/ClickHouse/ClickHouse/pull/32751) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* fix crash when used fuzzBits with multiply same FixedString, Close [#32737](https://github.com/ClickHouse/ClickHouse/issues/32737). [#32755](https://github.com/ClickHouse/ClickHouse/pull/32755) ([SuperDJY](https://github.com/cmsxbc)).
+* Fix `--database` option for clickhouse-local. [#32797](https://github.com/ClickHouse/ClickHouse/pull/32797) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Server might fail to start if database with `MySQL` engine cannot connect to MySQL server, it's fixed. Fixes [#14441](https://github.com/ClickHouse/ClickHouse/issues/14441). [#32802](https://github.com/ClickHouse/ClickHouse/pull/32802) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Avoid reusing the scalar subquery cache when processing MV blocks. This fixes a bug when the scalar query reference the source table but it means that all subscalar queries in the MV definition will be calculated for each block. [#32811](https://github.com/ClickHouse/ClickHouse/pull/32811) ([Raúl Marín](https://github.com/Algunenano)).
+* `MergeTree` table engine might silently skip some mutations if there are too many running mutations or in case of high memory consumption, it's fixed. Fixes [#17882](https://github.com/ClickHouse/ClickHouse/issues/17882). [#32814](https://github.com/ClickHouse/ClickHouse/pull/32814) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix optimization with lazy seek for async reads from remote fs. Closes [#32803](https://github.com/ClickHouse/ClickHouse/issues/32803). [#32835](https://github.com/ClickHouse/ClickHouse/pull/32835) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed --echo option is not used by clickhouse-client in batch mode with single query. [#32843](https://github.com/ClickHouse/ClickHouse/pull/32843) ([N. Kolotov](https://github.com/nkolotov)).
+* Fix MV query with multiple chunk result. Fixes [#31419](https://github.com/ClickHouse/ClickHouse/issues/31419). [#32862](https://github.com/ClickHouse/ClickHouse/pull/32862) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Close [#32487](https://github.com/ClickHouse/ClickHouse/issues/32487). [#32914](https://github.com/ClickHouse/ClickHouse/pull/32914) ([Vladimir C](https://github.com/vdimir)).
+* Fix ORC stripe reading. [#32929](https://github.com/ClickHouse/ClickHouse/pull/32929) ([Ernest Zaslavsky](https://github.com/kreuzerkrieg)).
+* Fix a regression in `replaceRegexpAll` function. The function worked incorrectly when matched substring was empty. This closes [#32777](https://github.com/ClickHouse/ClickHouse/issues/32777). This closes [#30245](https://github.com/ClickHouse/ClickHouse/issues/30245). [#32945](https://github.com/ClickHouse/ClickHouse/pull/32945) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix UB in case of unexpected EOF during filling a set from HTTP query (i.e. if the client interrupted in the middle, i.e. `timeout 0.15s curl -Ss -F 's=@t.csv;' 'http://127.0.0.1:8123/?s_structure=key+Int&query=SELECT+dummy+IN+s'` and with large enough `t.csv`). [#32955](https://github.com/ClickHouse/ClickHouse/pull/32955) ([Azat Khuzhin](https://github.com/azat)).
+* Fix throwing exception like positional argument out of bounds for non-positional arguments. Closes [#31173](https://github.com/ClickHouse/ClickHouse/issues/31173)#event-5789668239. [#32961](https://github.com/ClickHouse/ClickHouse/pull/32961) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix hdfs url check that didn't allow using HA namenode address. Bug was introduced in https://github.com/ClickHouse/ClickHouse/pull/31042. [#32976](https://github.com/ClickHouse/ClickHouse/pull/32976) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix wrong tuple output in CSV format in case of custom csv delimiter. [#32981](https://github.com/ClickHouse/ClickHouse/pull/32981) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix Context leak in case of cancel_http_readonly_queries_on_client_close (i.e. leaking of external tables that had been uploaded the the server and other resources). [#32982](https://github.com/ClickHouse/ClickHouse/pull/32982) ([Azat Khuzhin](https://github.com/azat)).
+* Remove obsolete code from ConfigProcessor. Yandex specific code is not used anymore. The code contained one minor defect. This defect was reported by [Mallik Hassan](https://github.com/SadiHassan) in [#33032](https://github.com/ClickHouse/ClickHouse/issues/33032). This closes [#33032](https://github.com/ClickHouse/ClickHouse/issues/33032). [#33026](https://github.com/ClickHouse/ClickHouse/pull/33026) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix s3 table function reading empty file. Closes [#33008](https://github.com/ClickHouse/ClickHouse/issues/33008). [#33037](https://github.com/ClickHouse/ClickHouse/pull/33037) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix error `Invalid version for SerializationLowCardinality key column` in case of reading from `LowCardinality` column with `local_filesystem_read_prefetch` or `remote_filesystem_read_prefetch` enabled. [#33046](https://github.com/ClickHouse/ClickHouse/pull/33046) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Don't allow to write into S3 if path contains globs. [#33142](https://github.com/ClickHouse/ClickHouse/pull/33142) ([Kruglov Pavel](https://github.com/Avogar)).
+* fix incorrect metric: StorageBufferBytes. [#33159](https://github.com/ClickHouse/ClickHouse/pull/33159) ([xuyatian](https://github.com/xuyatian)).
+* Fix MaterializedPostreSQL detach/attach (removing / adding to replication) tables with non-default schema. Found in [#29535](https://github.com/ClickHouse/ClickHouse/issues/29535). [#33179](https://github.com/ClickHouse/ClickHouse/pull/33179) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Make sure unused replication slots are always removed. Found in [#26952](https://github.com/ClickHouse/ClickHouse/issues/26952),. [#33187](https://github.com/ClickHouse/ClickHouse/pull/33187) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix ddl validation. Fix setting `materialized_postgresql_allow_automatic_update`. Closes [#29535](https://github.com/ClickHouse/ClickHouse/issues/29535). [#33200](https://github.com/ClickHouse/ClickHouse/pull/33200) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix WHERE 1=0 for external databases query. Closes [#33152](https://github.com/ClickHouse/ClickHouse/issues/33152). [#33214](https://github.com/ClickHouse/ClickHouse/pull/33214) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add asynchronous inserts (with enabled setting `async_insert`) to query log. Previously such queries didn't appear in query log. [#33239](https://github.com/ClickHouse/ClickHouse/pull/33239) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix ACLMap num, because acl_to_num will erase. [#33246](https://github.com/ClickHouse/ClickHouse/pull/33246) ([小路](https://github.com/nicelulu)).
+* Fix ACL with explicit digit hash in clickhouse-keeper: now the behavior consistent with zookeeper and generated digest is always accepted. [#33249](https://github.com/ClickHouse/ClickHouse/pull/33249) ([小路](https://github.com/nicelulu)).
+* Fix when `COMMENT` for dictionaries does not appear in `system.tables`, `system.dictionaries`. Allow to modify comment for `Dictionary` engine. Closes [#33251](https://github.com/ClickHouse/ClickHouse/issues/33251). [#33261](https://github.com/ClickHouse/ClickHouse/pull/33261) ([Maksim Kita](https://github.com/kitaisreal)).
+* The commands `SYSTEM SUSPEND` and `SYSTEM ... THREAD FUZZER` missed access control. It is fixed. Author: Kevin Michel. [#33333](https://github.com/ClickHouse/ClickHouse/pull/33333) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Do not try to read pass EOF (to workaround a bug in a kernel), this bug can be reproduced on kernels (3.14..5.9), and requires `index_granularity_bytes=0` (i.e. turn off adaptive index granularity). [#33372](https://github.com/ClickHouse/ClickHouse/pull/33372) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible use-after-free for INSERT into MV with concurrent DROP ([#32572](https://github.com/ClickHouse/ClickHouse/issues/32572) significantly reduce the race window, this one should completely eliminate it). [#33386](https://github.com/ClickHouse/ClickHouse/pull/33386) ([Azat Khuzhin](https://github.com/azat)).
+* Fix query cancellation in case of allow_experimental_parallel_reading_from_replicas. [#33456](https://github.com/ClickHouse/ClickHouse/pull/33456) ([Azat Khuzhin](https://github.com/azat)).
+* Fix DROP MaterializedPostgreSQL database. [#33468](https://github.com/ClickHouse/ClickHouse/pull/33468) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix dictionary expressions for RangeHashedDictionary range min and range max attributes when created using DDL. Closes [#30809](https://github.com/ClickHouse/ClickHouse/issues/30809). [#33478](https://github.com/ClickHouse/ClickHouse/pull/33478) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix an exception `Block structure mismatch` which may happen during insertion into table with default nested `LowCardinality` column. Fixes [#33028](https://github.com/ClickHouse/ClickHouse/issues/33028). [#33504](https://github.com/ClickHouse/ClickHouse/pull/33504) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Close issue: [#33289](https://github.com/ClickHouse/ClickHouse/issues/33289) Fix bug when query view with setting offset and limit. [#33518](https://github.com/ClickHouse/ClickHouse/pull/33518) ([hexiaoting](https://github.com/hexiaoting)).
+* Fix parsing incorrect queries with FROM INFILE statement. [#33521](https://github.com/ClickHouse/ClickHouse/pull/33521) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix segfault in arrowSchemaToCHHeader if schema contains Dictionary type. Closes [#33507](https://github.com/ClickHouse/ClickHouse/issues/33507). [#33529](https://github.com/ClickHouse/ClickHouse/pull/33529) ([Kruglov Pavel](https://github.com/Avogar)).
+* session_id_counter poniter to next slot. [#33555](https://github.com/ClickHouse/ClickHouse/pull/33555) ([小路](https://github.com/nicelulu)).
+* Fix segfault in Avro that appears after the second insert into file. [#33566](https://github.com/ClickHouse/ClickHouse/pull/33566) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix wrong database for JOIN w/o explicit database in distributed queries (Fixes: [#10471](https://github.com/ClickHouse/ClickHouse/issues/10471)). [#33611](https://github.com/ClickHouse/ClickHouse/pull/33611) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Update CHANGELOG.md'. [#32472](https://github.com/ClickHouse/ClickHouse/pull/32472) ([Rich Raposa](https://github.com/rfraposa)).
+* NO CL ENTRY:  'Revert "Split long tests into multiple checks"'. [#32514](https://github.com/ClickHouse/ClickHouse/pull/32514) ([alesapin](https://github.com/alesapin)).
+* NO CL ENTRY:  'Revert "Revert "Split long tests into multiple checks""'. [#32515](https://github.com/ClickHouse/ClickHouse/pull/32515) ([alesapin](https://github.com/alesapin)).
+* NO CL ENTRY:  'blog post how to enable predictive capabilities in Clickhouse'. [#32768](https://github.com/ClickHouse/ClickHouse/pull/32768) ([Tom Risse](https://github.com/flickerbox-tom)).
+* NO CL ENTRY:  'Revert "Fix build issue related to azure blob storage"'. [#32845](https://github.com/ClickHouse/ClickHouse/pull/32845) ([alesapin](https://github.com/alesapin)).
+* NO CL ENTRY:  'Revert "Dictionaries added Date32 type support"'. [#33053](https://github.com/ClickHouse/ClickHouse/pull/33053) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Updated Lawrence Berkeley National Lab stats'. [#33066](https://github.com/ClickHouse/ClickHouse/pull/33066) ([Michael Smitasin](https://github.com/michaelsmitasin)).
+* NO CL ENTRY:  'fix AggregateFunctionGroupBitmapData function rb_contains rb_remove'. [#33127](https://github.com/ClickHouse/ClickHouse/pull/33127) ([DR](https://github.com/freedomDR)).
+* NO CL ENTRY:  'Fix for example request with settings'. [#33143](https://github.com/ClickHouse/ClickHouse/pull/33143) ([Vitaly Artemyev](https://github.com/VitalyArt)).
+* NO CL ENTRY:  'Revert "Grouping sets dev"'. [#33186](https://github.com/ClickHouse/ClickHouse/pull/33186) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Optimize MergeTreePartsMover'. [#33225](https://github.com/ClickHouse/ClickHouse/pull/33225) ([zhongyuankai](https://github.com/zhongyuankai)).
+* NO CL ENTRY:  'rm redundant judge in hashmap iter operation'. [#33285](https://github.com/ClickHouse/ClickHouse/pull/33285) ([zbtzbtzbt](https://github.com/zbtzbtzbt)).
+* NO CL ENTRY:  'fix hang up with command 'drop table system.query_log sync''. [#33293](https://github.com/ClickHouse/ClickHouse/pull/33293) ([zhanghuajie](https://github.com/zhanghuajieHIT)).
+* NO CL ENTRY:  'Improve query performance of system tables'. [#33312](https://github.com/ClickHouse/ClickHouse/pull/33312) ([zhongyuankai](https://github.com/zhongyuankai)).
+* NO CL ENTRY:  'Revert "Better cmake script for azure blob"'. [#33319](https://github.com/ClickHouse/ClickHouse/pull/33319) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* NO CL ENTRY:  'Added Superwall to adopters list'. [#33573](https://github.com/ClickHouse/ClickHouse/pull/33573) ([Justin Hilliard](https://github.com/jahilliard)).
+* NO CL ENTRY:  'Revert "Ignore parse failure of opentelemetry header"'. [#33594](https://github.com/ClickHouse/ClickHouse/pull/33594) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release):
+
+* Fix possible crash (or incorrect result) in case of `LowCardinality` arguments of window function. Fixes [#31114](https://github.com/ClickHouse/ClickHouse/issues/31114). [#31888](https://github.com/ClickHouse/ClickHouse/pull/31888) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### NO CL CATEGORY
+
+* Fix Regular Expression while key path search. [#33023](https://github.com/ClickHouse/ClickHouse/pull/33023) ([mreddy017](https://github.com/mreddy017)).
+* - Allow to split GraphiteMergeTree rollup rules for plain/tagged metrics (optional rule_type field). [#33494](https://github.com/ClickHouse/ClickHouse/pull/33494) ([Michail Safronov](https://github.com/msaf1980)).
+
+#### Bug Fix (v21.9.4.35-stable)
+
+* Fix [#32964](https://github.com/ClickHouse/ClickHouse/issues/32964). [#32965](https://github.com/ClickHouse/ClickHouse/pull/32965) ([save-my-heart](https://github.com/save-my-heart)).
+
+#### New Feature / New Tool
+
+* Tool for collecting diagnostics data. [#33175](https://github.com/ClickHouse/ClickHouse/pull/33175) ([Alexander Burmak](https://github.com/Alex-Burmak)).
+
diff --git a/docs/changelogs/v22.1.2.2-stable.md b/docs/changelogs/v22.1.2.2-stable.md
new file mode 100644
index 00000000000..450c640bc5e
--- /dev/null
+++ b/docs/changelogs/v22.1.2.2-stable.md
@@ -0,0 +1,2 @@
+### ClickHouse release v22.1.2.2-stable FIXME as compared to v22.1.1.2542-prestable
+
diff --git a/docs/changelogs/v22.1.3.7-stable.md b/docs/changelogs/v22.1.3.7-stable.md
new file mode 100644
index 00000000000..ffb0ec6048d
--- /dev/null
+++ b/docs/changelogs/v22.1.3.7-stable.md
@@ -0,0 +1,2 @@
+### ClickHouse release v22.1.3.7-stable FIXME as compared to v22.1.2.2-stable
+
diff --git a/docs/changelogs/v22.1.4.30-stable.md b/docs/changelogs/v22.1.4.30-stable.md
new file mode 100644
index 00000000000..1ea56131481
--- /dev/null
+++ b/docs/changelogs/v22.1.4.30-stable.md
@@ -0,0 +1,19 @@
+### ClickHouse release v22.1.4.30-stable FIXME as compared to v22.1.3.7-stable
+
+#### Build/Testing/Packaging Improvement
+* Backport CI checks to 22.1 release branch. [#34897](https://github.com/ClickHouse/ClickHouse/pull/34897) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#34119](https://github.com/ClickHouse/ClickHouse/issues/34119): Fix usage of functions `array` and `tuple` with literal arguments in distributed queries. Previously it could lead to `Not found columns` exception. [#33938](https://github.com/ClickHouse/ClickHouse/pull/33938) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#34124](https://github.com/ClickHouse/ClickHouse/issues/34124): Fix crash while reading of nested tuples. Fixes [#33838](https://github.com/ClickHouse/ClickHouse/issues/33838). [#33956](https://github.com/ClickHouse/ClickHouse/pull/33956) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#34098](https://github.com/ClickHouse/ClickHouse/issues/34098): Fix segfault while parsing ORC file with corrupted footer. Closes [#33797](https://github.com/ClickHouse/ClickHouse/issues/33797). [#33984](https://github.com/ClickHouse/ClickHouse/pull/33984) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#34038](https://github.com/ClickHouse/ClickHouse/issues/34038): Fix bug which lead to inability for server to start when both replicated access storage and keeper are used. Introduced two settings for keeper socket timeout instead of settings from default user: `keeper_server.socket_receive_timeout_sec` and `keeper_server.socket_send_timeout_sec`. Fixes [#33973](https://github.com/ClickHouse/ClickHouse/issues/33973). [#33988](https://github.com/ClickHouse/ClickHouse/pull/33988) ([alesapin](https://github.com/alesapin)).
+* Backported in [#34184](https://github.com/ClickHouse/ClickHouse/issues/34184): Fixed minor race condition that might cause "intersecting parts" error in extremely rare cases after ZooKeeper connection loss. [#34096](https://github.com/ClickHouse/ClickHouse/pull/34096) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#34467](https://github.com/ClickHouse/ClickHouse/issues/34467): Fix inserts to distributed tables in case of change of native protocol. The last change was in the version version 22.1, so there may be some failures of inserts to distributed tables after upgrade to that version. [#34132](https://github.com/ClickHouse/ClickHouse/pull/34132) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#34209](https://github.com/ClickHouse/ClickHouse/issues/34209): Fix bug which can rarely lead to error "Cannot read all data" while reading LowCardinality columns of MergeTree table engines family which stores data on remote file system like S3. [#34139](https://github.com/ClickHouse/ClickHouse/pull/34139) ([alesapin](https://github.com/alesapin)).
+* Backported in [#34266](https://github.com/ClickHouse/ClickHouse/issues/34266): Fix metric `Query`, which shows number of executing queries. In last several releases it was always 0. [#34224](https://github.com/ClickHouse/ClickHouse/pull/34224) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#34298](https://github.com/ClickHouse/ClickHouse/issues/34298): Fix progress bar width. It was incorrectly rounded to integer number of characters. [#34275](https://github.com/ClickHouse/ClickHouse/pull/34275) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#34391](https://github.com/ClickHouse/ClickHouse/issues/34391): Try to fix rare bug while reading of empty arrays, which could lead to `Data compressed with different methods` error. [#34327](https://github.com/ClickHouse/ClickHouse/pull/34327) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#34430](https://github.com/ClickHouse/ClickHouse/issues/34430): Fix segfault in schema inference from url. Closes [#34147](https://github.com/ClickHouse/ClickHouse/issues/34147). [#34405](https://github.com/ClickHouse/ClickHouse/pull/34405) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v22.2.1.2139-prestable.md b/docs/changelogs/v22.2.1.2139-prestable.md
new file mode 100644
index 00000000000..187a2a26a66
--- /dev/null
+++ b/docs/changelogs/v22.2.1.2139-prestable.md
@@ -0,0 +1,208 @@
+### ClickHouse release v22.2.1.2139-prestable FIXME as compared to v22.1.1.2542-prestable
+
+#### New Feature
+* (Not ready for production, put into experimental features) Add memory overcommit to `MemoryTracker`. Added `guaranteed` settings for memory limits which represent soft memory limits. In case when hard memory limit is reached, `MemoryTracker` tries to cancel the most overcommited query. New setting `memory_usage_overcommit_max_wait_microseconds` specifies how long queries may wait another query to stop. Closes [#28375](https://github.com/ClickHouse/ClickHouse/issues/28375). [#31182](https://github.com/ClickHouse/ClickHouse/pull/31182) ([Dmitry Novik](https://github.com/novikd)).
+* The setting allows a user to provide own deduplication semantic in MergeTree/ReplicatedMergeTree If provided, it's used instead of data digest to generate block ID. So, for example, by providing a unique value for the setting in each INSERT statement, the user can avoid the same inserted data being deduplicated. This closes: [#7461](https://github.com/ClickHouse/ClickHouse/issues/7461). [#32304](https://github.com/ClickHouse/ClickHouse/pull/32304) ([Igor Nikonov](https://github.com/devcrafter)).
+* Add support of DEFAULT keyword for INSERT statements. Closes [#6331](https://github.com/ClickHouse/ClickHouse/issues/6331). [#33141](https://github.com/ClickHouse/ClickHouse/pull/33141) ([Andrii Buriachevskyi](https://github.com/0over)).
+* Add confidence intervals to ttests. [#33260](https://github.com/ClickHouse/ClickHouse/pull/33260) ([achimbab](https://github.com/achimbab)).
+* Allow to create new files on insert for File/S3/HDFS engines. Allow to owerwrite file in HDFS. Throw an exception in attempt to overwrite a file in S3 by default. Throw an exception in attempt to append data to file in formats that have suffix. Closes [#31640](https://github.com/ClickHouse/ClickHouse/issues/31640) Closes [#31622](https://github.com/ClickHouse/ClickHouse/issues/31622) Closes [#23862](https://github.com/ClickHouse/ClickHouse/issues/23862) Closes [#15022](https://github.com/ClickHouse/ClickHouse/issues/15022) Closes [#16674](https://github.com/ClickHouse/ClickHouse/issues/16674). [#33302](https://github.com/ClickHouse/ClickHouse/pull/33302) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add `h3ToCenterChild` function. [#33313](https://github.com/ClickHouse/ClickHouse/pull/33313) ([Bharat Nallan](https://github.com/bharatnc)).
+* Merge functions for text classification. See [#23271](https://github.com/ClickHouse/ClickHouse/issues/23271). [#33314](https://github.com/ClickHouse/ClickHouse/pull/33314) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Implemented meanZTest. [#33354](https://github.com/ClickHouse/ClickHouse/pull/33354) ([achimbab](https://github.com/achimbab)).
+* - Add function bitSlice. [#33360](https://github.com/ClickHouse/ClickHouse/pull/33360) ([RogerYK](https://github.com/RogerYK)).
+* Add new h3 miscellaneous functions: `edgeLengthKm`,`exactEdgeLengthKm`,`exactEdgeLengthM`,`exactEdgeLengthRads`,`numHexagons`. [#33621](https://github.com/ClickHouse/ClickHouse/pull/33621) ([Bharat Nallan](https://github.com/bharatnc)).
+* Add `DEGREES` and `RADIANS` functions. [#33769](https://github.com/ClickHouse/ClickHouse/pull/33769) ([Bharat Nallan](https://github.com/bharatnc)).
+* Parameter `--host` can accept multiple hosts. In case of unavailability of one of them, the client will try to connect to the next one. [#33824](https://github.com/ClickHouse/ClickHouse/pull/33824) ([Filippov Denis](https://github.com/DF5HSE)).
+* Detect format in clickhouse-local by file name. [#33829](https://github.com/ClickHouse/ClickHouse/pull/33829) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add a new method `expire()` in PoolBase which is used to reallocate an invalid object in the pool. [#34076](https://github.com/ClickHouse/ClickHouse/pull/34076) ([lgbo](https://github.com/lgbo-ustc)).
+* Add table function `format(format_name, data)`. [#34125](https://github.com/ClickHouse/ClickHouse/pull/34125) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow to create default table engine. [#34187](https://github.com/ClickHouse/ClickHouse/pull/34187) ([Ilya Yatsishin](https://github.com/qoega)).
+* `EPHEMERAL` column specifier is added to `CREATE TABLE` query. Closes [#9436](https://github.com/ClickHouse/ClickHouse/issues/9436). [#34424](https://github.com/ClickHouse/ClickHouse/pull/34424) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Performance Improvement
+* For inserts and merges into S3, write files in parallel whenever possible. [#33291](https://github.com/ClickHouse/ClickHouse/pull/33291) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Improve RangeHashedDictionary performance if for key there are a lot of intervals. Fixes [#23821](https://github.com/ClickHouse/ClickHouse/issues/23821). [#33516](https://github.com/ClickHouse/ClickHouse/pull/33516) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add x86 avx512 support for memcmpSmall functions to accelerate memory comparison. It works only if you compile ClickHouse by yourself. [#33706](https://github.com/ClickHouse/ClickHouse/pull/33706) ([hanqf-git](https://github.com/hanqf-git)).
+* Reworks and reintroduces the scalar cache to MV execution. [#33958](https://github.com/ClickHouse/ClickHouse/pull/33958) ([Raúl Marín](https://github.com/Algunenano)).
+* Make ORDER BY tuple almost as fast as ORDER BY columns. We have special optimizations for multiple column ORDER BY: https://github.com/ClickHouse/ClickHouse/pull/10831 . It's beneficial to also apply to tuple columns. [#34060](https://github.com/ClickHouse/ClickHouse/pull/34060) ([Amos Bird](https://github.com/amosbird)).
+* Minor improvement to potential hot-path in `ExecuteScalarSubqueriesMatcher::visit` , where `std::set<String>` was constructed on every function invocation. [#34128](https://github.com/ClickHouse/ClickHouse/pull/34128) ([Federico Rodriguez](https://github.com/fedrod)).
+* Slightly improve performance of `Regexp` format. [#34202](https://github.com/ClickHouse/ClickHouse/pull/34202) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Optimize quantilesExact{Low,High} to use nth_element instead of sort. [#34287](https://github.com/ClickHouse/ClickHouse/pull/34287) ([Daniel Kutenin](https://github.com/danlark1)).
+* Improve performance of `LineAsString` format. This closes [#34303](https://github.com/ClickHouse/ClickHouse/issues/34303). [#34306](https://github.com/ClickHouse/ClickHouse/pull/34306) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Speed up loading of data parts. It was not parallelized before: the setting `part_loading_threads` did not have effect. See [#4699](https://github.com/ClickHouse/ClickHouse/issues/4699). [#34310](https://github.com/ClickHouse/ClickHouse/pull/34310) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* `_file` and `_path` virtual columns (in file-like table engines) are made `LowCardinality` - it will make queries for multiple files faster. Closes [#34300](https://github.com/ClickHouse/ClickHouse/issues/34300). [#34317](https://github.com/ClickHouse/ClickHouse/pull/34317) ([flynn](https://github.com/ucasfl)).
+* Improve performance of `mapPopulateSeries` function. Closes [#33944](https://github.com/ClickHouse/ClickHouse/issues/33944). [#34318](https://github.com/ClickHouse/ClickHouse/pull/34318) ([Maksim Kita](https://github.com/kitaisreal)).
+* Use a vector to collect useless list iterators when doing a snapshot, and in latter clearOutdatedNodes, we can just traverse the vector, not the list, which is faster. [#34484](https://github.com/ClickHouse/ClickHouse/pull/34484) ([zhanglistar](https://github.com/zhanglistar)).
+* Improve performance of insert into table functions URL, S3, File, HDFS. Closes [#34348](https://github.com/ClickHouse/ClickHouse/issues/34348). [#34510](https://github.com/ClickHouse/ClickHouse/pull/34510) ([Maksim Kita](https://github.com/kitaisreal)).
+* According https://github.com/eBay/NuRaft/issues/209, there is no need to lock the mothod. [#34523](https://github.com/ClickHouse/ClickHouse/pull/34523) ([zhanglistar](https://github.com/zhanglistar)).
+
+#### Improvement
+* Now ReplicatedMergeTree can recover data when some of its disks are broken. [#13544](https://github.com/ClickHouse/ClickHouse/pull/13544) ([Amos Bird](https://github.com/amosbird)).
+* Merge [#15765](https://github.com/ClickHouse/ClickHouse/issues/15765) (Dynamic reload of server TLS certificates on config reload) cc @johnskopis. [#31257](https://github.com/ClickHouse/ClickHouse/pull/31257) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Added `UUID` data type support for functions `hex`, `bin`. [#32170](https://github.com/ClickHouse/ClickHouse/pull/32170) ([Frank Chen](https://github.com/FrankChen021)).
+* Support `optimize_read_in_order` if prefix of sorting key is already sorted. E.g. if we have sorting key `ORDER BY (a, b)` in table and query with `WHERE a = const ORDER BY b` clauses, now it will be applied reading in order of sorting key instead of full sort. [#32748](https://github.com/ClickHouse/ClickHouse/pull/32748) ([Anton Popov](https://github.com/CurtizJ)).
+* Add new keeper setting `min_session_timeout_ms`. Now keeper server will determine client session timeout according to `min_session_timeout_ms` and `session_timeout_ms` settings. [#33288](https://github.com/ClickHouse/ClickHouse/pull/33288) ([JackyWoo](https://github.com/JackyWoo)).
+* Improve keeper performance and fix several memory leaks. [#33329](https://github.com/ClickHouse/ClickHouse/pull/33329) ([alesapin](https://github.com/alesapin)).
+* Respect cgroup limits for CPU quota. [#33342](https://github.com/ClickHouse/ClickHouse/pull/33342) ([JaySon](https://github.com/JaySon-Huang)).
+* Enable binary arithmetic(plus, minus, multiply, division, least, greates) between Decimal and Float. [#33355](https://github.com/ClickHouse/ClickHouse/pull/33355) ([flynn](https://github.com/ucasfl)).
+* Replace `_shard_num` via constants (from [#7624](https://github.com/ClickHouse/ClickHouse/issues/7624)) with `shardNum()` function (from [#27020](https://github.com/ClickHouse/ClickHouse/issues/27020)), to avoid possible issues (like those that had been found in [#16947](https://github.com/ClickHouse/ClickHouse/issues/16947)). [#33392](https://github.com/ClickHouse/ClickHouse/pull/33392) ([Azat Khuzhin](https://github.com/azat)).
+* Support `SET`, `YEAR`, `TIME` and `GEOMETRY` data types in `MaterializedMySQL`. Fixes [#18091](https://github.com/ClickHouse/ClickHouse/issues/18091), [#21536](https://github.com/ClickHouse/ClickHouse/issues/21536), [#26361](https://github.com/ClickHouse/ClickHouse/issues/26361). [#33429](https://github.com/ClickHouse/ClickHouse/pull/33429) ([zzsmdfj](https://github.com/zzsmdfj)).
+* add function addressToLineWithInlines. Close [#26211](https://github.com/ClickHouse/ClickHouse/issues/26211). [#33467](https://github.com/ClickHouse/ClickHouse/pull/33467) ([SuperDJY](https://github.com/cmsxbc)).
+* Improvement for `fromUnixTimestamp64` family functions.. They now accept any integer value that can be converted to `Int64`. This closes: [#14648](https://github.com/ClickHouse/ClickHouse/issues/14648). [#33505](https://github.com/ClickHouse/ClickHouse/pull/33505) ([Andrey Zvonov](https://github.com/zvonand)).
+* Functions `dictGet`, `dictHas` implicitly cast key argument to dictionary key structure, if they are different. [#33672](https://github.com/ClickHouse/ClickHouse/pull/33672) ([Maksim Kita](https://github.com/kitaisreal)).
+* - Parse and store OpenTelemetry trace-id in big-endian order. [#33723](https://github.com/ClickHouse/ClickHouse/pull/33723) ([Frank Chen](https://github.com/FrankChen021)).
+* Enable stream to table join in WindowView. [#33729](https://github.com/ClickHouse/ClickHouse/pull/33729) ([vxider](https://github.com/Vxider)).
+* Create parent directories in DiskS3::restoreFileOperations method. [#33730](https://github.com/ClickHouse/ClickHouse/pull/33730) ([ianton-ru](https://github.com/ianton-ru)).
+* Add some improvements and fixes for Bool data type. Fixes [#33244](https://github.com/ClickHouse/ClickHouse/issues/33244). [#33737](https://github.com/ClickHouse/ClickHouse/pull/33737) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added support for cast from `Map(Key, Value)` to `Array(Tuple(Key, Value))`. [#33794](https://github.com/ClickHouse/ClickHouse/pull/33794) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support explain create function query ``` sql :) explain ast create function mycast AS (n) -> cast(n as String); EXPLAIN AST CREATE FUNCTION mycast AS n -> CAST(n, 'String'). [#33819](https://github.com/ClickHouse/ClickHouse/pull/33819) ([李扬](https://github.com/taiyang-li)).
+* Try every resolved ip address while getting S3 proxy. [#33862](https://github.com/ClickHouse/ClickHouse/pull/33862) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* `FlatDictionary` improve performance of dictionary data load. [#33871](https://github.com/ClickHouse/ClickHouse/pull/33871) ([Maksim Kita](https://github.com/kitaisreal)).
+* fix disk using the same path, close [#29072](https://github.com/ClickHouse/ClickHouse/issues/29072). [#33905](https://github.com/ClickHouse/ClickHouse/pull/33905) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Dictionaries added support for DateTime64. [#33914](https://github.com/ClickHouse/ClickHouse/pull/33914) ([Maksim Kita](https://github.com/kitaisreal)).
+* `FlatDictionary`, `HashedDictionary`, `HashedArrayDictionary` added support for creating with empty attributes, with support of read all keys, and `dictHas`. Fixes [#33820](https://github.com/ClickHouse/ClickHouse/issues/33820). [#33918](https://github.com/ClickHouse/ClickHouse/pull/33918) ([Maksim Kita](https://github.com/kitaisreal)).
+* `RangeHashedDictionary` improvements. Improve performance of load time if there are multiple attributes. Allow to create without attributes. Added option to specify strategy when intervals `start` and `end` have `Nullable` type `convert_null_range_bound_to_open` by default is `true`. Closes [#29791](https://github.com/ClickHouse/ClickHouse/issues/29791). Allow to specify `Float`, `Decimal`, `DateTime64`, `Int128`, `Int256`, `UInt128`, `UInt256` as range types. `RangeHashedDictionary` added support for range values that extend `Int64` type. Closes [#28322](https://github.com/ClickHouse/ClickHouse/issues/28322). Added option `range_lookup_strategy` to specify range lookup type `min`, `max` by default is `min` . Closes [#21647](https://github.com/ClickHouse/ClickHouse/issues/21647). Fixed allocated bytes calculations. Fixed type name in `system.dictionaries` in case of `ComplexKeyHashedDictionary`. [#33927](https://github.com/ClickHouse/ClickHouse/pull/33927) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix getauxval() in glibc-compatibility, this should fix vsyscalls after `setenv` (i.e. timezone is set in config), and LSan (and also fix some leaks that had been found by LSan). [#33957](https://github.com/ClickHouse/ClickHouse/pull/33957) ([Azat Khuzhin](https://github.com/azat)).
+* Detect format and schema from stdin in clickhouse-local. [#33960](https://github.com/ClickHouse/ClickHouse/pull/33960) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed UTF-8 string case-insensitive search when lowercase and uppercase characters are represented by different number of bytes. Example is `ẞ` and `ß`. This closes [#7334](https://github.com/ClickHouse/ClickHouse/issues/7334). [#33992](https://github.com/ClickHouse/ClickHouse/pull/33992) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fix memory accounting for queries that uses < max_untracker_memory. [#34001](https://github.com/ClickHouse/ClickHouse/pull/34001) ([Azat Khuzhin](https://github.com/azat)).
+* Supports all types of SYSTEM query ON CLUSTER clause. [#34005](https://github.com/ClickHouse/ClickHouse/pull/34005) ([小路](https://github.com/nicelulu)).
+* Add schema inference for values() table function. Closes [#33811](https://github.com/ClickHouse/ClickHouse/issues/33811). [#34017](https://github.com/ClickHouse/ClickHouse/pull/34017) ([Kruglov Pavel](https://github.com/Avogar)).
+* Tracing context is now propagated from GRPC client metadata. [#34064](https://github.com/ClickHouse/ClickHouse/pull/34064) ([andremarianiello](https://github.com/andremarianiello)).
+* Add UUID suport in MsgPack input/output format. [#34065](https://github.com/ClickHouse/ClickHouse/pull/34065) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improving the experience of multiple line editing for clickhouse-client. This is a follow-up of https://github.com/ClickHouse/ClickHouse/pull/31123. [#34114](https://github.com/ClickHouse/ClickHouse/pull/34114) ([Amos Bird](https://github.com/amosbird)).
+* Maxsplit argument for splitByChar. close [#34081](https://github.com/ClickHouse/ClickHouse/issues/34081). [#34140](https://github.com/ClickHouse/ClickHouse/pull/34140) ([李扬](https://github.com/taiyang-li)).
+* Allow to parse dictionary `PRIMARY KEY` as `PRIMARY KEY (id, value)`, previously supported only `PRIMARY KEY id, value`. Closes [#34135](https://github.com/ClickHouse/ClickHouse/issues/34135). [#34141](https://github.com/ClickHouse/ClickHouse/pull/34141) ([Maksim Kita](https://github.com/kitaisreal)).
+* Allow carriage return in the middle of the line while parsing by `Regexp` format. This closes [#34200](https://github.com/ClickHouse/ClickHouse/issues/34200). [#34205](https://github.com/ClickHouse/ClickHouse/pull/34205) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Recognize `YYYYMMDD-hhmmss` format in `parseDateTimeBestEffort` function. This closes [#34206](https://github.com/ClickHouse/ClickHouse/issues/34206). [#34208](https://github.com/ClickHouse/ClickHouse/pull/34208) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add ability to compose PostgreSQL-style cast operator `::` with `ArrayElement` and `TupleElement`. [#34229](https://github.com/ClickHouse/ClickHouse/pull/34229) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added `#!` and `# ` as a recognised start of a single line comment. Reference to task [#34138](https://github.com/ClickHouse/ClickHouse/issues/34138). [#34230](https://github.com/ClickHouse/ClickHouse/pull/34230) ([Aaron Katz](https://github.com/aaronstephenkatz)).
+* Change severity of the "Cancelled merging parts" message in logs, because it's not an error. This closes [#34148](https://github.com/ClickHouse/ClickHouse/issues/34148). [#34232](https://github.com/ClickHouse/ClickHouse/pull/34232) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Apply data skipping indexes for queries with FINAL may produce incorrect result. Disable data skipping indexes by default for queries with FINAL (introduce new `use_skip_indexes_if_final` setting and disable it by default). [#34243](https://github.com/ClickHouse/ClickHouse/pull/34243) ([Azat Khuzhin](https://github.com/azat)).
+* Support asynchronous inserts in `clickhouse-client` for queries with inlined data. [#34267](https://github.com/ClickHouse/ClickHouse/pull/34267) ([Anton Popov](https://github.com/CurtizJ)).
+* Cancel merges before acquiring table lock for `TRUNCATE` query to avoid `DEADLOCK_AVOIDED` error in some cases. Fixes [#34302](https://github.com/ClickHouse/ClickHouse/issues/34302). [#34304](https://github.com/ClickHouse/ClickHouse/pull/34304) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Some servers expect a User-Agent header in their HTTP requests. A `User-Agent` header entry has been added to HTTP requests of the form: User-Agent: ClickHouse/VERSION_STRING. [#34330](https://github.com/ClickHouse/ClickHouse/pull/34330) ([Saad Ur Rahman](https://github.com/surahman)).
+* REGEXP_MATCHES and REGEXP_REPLACE function aliases for compatibility with PostgreSQL. Close [#30885](https://github.com/ClickHouse/ClickHouse/issues/30885). [#34334](https://github.com/ClickHouse/ClickHouse/pull/34334) ([李扬](https://github.com/taiyang-li)).
+* Better handle pre-inputs before client start. This is for [#34308](https://github.com/ClickHouse/ClickHouse/issues/34308) . [#34336](https://github.com/ClickHouse/ClickHouse/pull/34336) ([Amos Bird](https://github.com/amosbird)).
+* Add options for clickhouse-format. Which close [#30528](https://github.com/ClickHouse/ClickHouse/issues/30528) - max_query_size - max_parser_depth. [#34349](https://github.com/ClickHouse/ClickHouse/pull/34349) ([李扬](https://github.com/taiyang-li)).
+* Default input and output formats that can be overriden by --input-format and --output-format. Close [#30631](https://github.com/ClickHouse/ClickHouse/issues/30631). [#34352](https://github.com/ClickHouse/ClickHouse/pull/34352) ([李扬](https://github.com/taiyang-li)).
+* Allow to skip not found urls for globs when using URL storage / table function. Also closes [#34359](https://github.com/ClickHouse/ClickHouse/issues/34359). [#34392](https://github.com/ClickHouse/ClickHouse/pull/34392) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add two new settings: `s3_upload_part_size_multiply_factor` and `s3_upload_part_size_multiply_parts_count_threshold`. Now each time `s3_upload_part_size_multiply_parts_count_threshold` uploaded to S3 from a single query `s3_min_upload_part_size` multiplied by `s3_upload_part_size_multiply_factor`. Fixes [#34244](https://github.com/ClickHouse/ClickHouse/issues/34244). [#34422](https://github.com/ClickHouse/ClickHouse/pull/34422) ([alesapin](https://github.com/alesapin)).
+* Allow `allow_experimental_projection_optimization` by default. [#34456](https://github.com/ClickHouse/ClickHouse/pull/34456) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Privileges CREATE/ALTER/DROP ROW POLICY now can be granted on a table or on `database.*` as well as globally `*.*`. [#34489](https://github.com/ClickHouse/ClickHouse/pull/34489) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Refactor client fault tolerant connection (https://github.com/ClickHouse/ClickHouse/pull/33824#issuecomment-1033690860). The new way to use it: ```bash clickhouse-client ... --host host1 --host host2 --port port2 --host host3 --port port --host host4 ```. [#34490](https://github.com/ClickHouse/ClickHouse/pull/34490) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improve schema inference in clickhouse-local. Allow to write just `clickhouse-local -q "select * from table" < data.format`. [#34495](https://github.com/ClickHouse/ClickHouse/pull/34495) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support `.jsonl` extension for JSONEachRow format. [#34496](https://github.com/ClickHouse/ClickHouse/pull/34496) ([Kruglov Pavel](https://github.com/Avogar)).
+* Send ProfileEvents statistics in case of INSERT SELECT query. [#34498](https://github.com/ClickHouse/ClickHouse/pull/34498) ([Dmitry Novik](https://github.com/novikd)).
+* Added sending of the output format back to client like it's done in HTTP protocol as suggested in [#34362](https://github.com/ClickHouse/ClickHouse/issues/34362). Closes [#34362](https://github.com/ClickHouse/ClickHouse/issues/34362). [#34499](https://github.com/ClickHouse/ClickHouse/pull/34499) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Allow to write `s3(url, access_key_id, secret_access_key)`. [#34503](https://github.com/ClickHouse/ClickHouse/pull/34503) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support `IF EXISTS` clause for `TTL expr TO [DISK|VOLUME] [IF EXISTS] 'xxx'` feature. Parts will be moved to disk or volume only if it exists on replica, so `MOVE TTL` rules will be able to behave differently on replicas according to the existing storage policies. Resolves [#34455](https://github.com/ClickHouse/ClickHouse/issues/34455). [#34504](https://github.com/ClickHouse/ClickHouse/pull/34504) ([Anton Popov](https://github.com/CurtizJ)).
+* Little improvement no need to clone log entry. [#34587](https://github.com/ClickHouse/ClickHouse/pull/34587) ([zhanglistar](https://github.com/zhanglistar)).
+* Slightly improve performance in case of filtering by sparse columns (which can be enabled by setting `ratio_of_defaults_for_sparse_serialization` in `MergeTree` tables). [#34601](https://github.com/ClickHouse/ClickHouse/pull/34601) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Bug Fix
+* This PR allows using multiple LDAP storages in the same list of user directories. It worked earlier but was broken because LDAP tests are disabled (they are part of the testflows tests). [#33574](https://github.com/ClickHouse/ClickHouse/pull/33574) ([Vitaly Baranov](https://github.com/vitlibar)).
+* This PR fixes [#18206](https://github.com/ClickHouse/ClickHouse/issues/18206). [#33977](https://github.com/ClickHouse/ClickHouse/pull/33977) ([Vitaly Baranov](https://github.com/vitlibar)).
+* This PR fixes [#19429](https://github.com/ClickHouse/ClickHouse/issues/19429). [#34225](https://github.com/ClickHouse/ClickHouse/pull/34225) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix inserting to temporary tables via gRPC. This PR fixes [#34347](https://github.com/ClickHouse/ClickHouse/issues/34347), issue `#2`. [#34364](https://github.com/ClickHouse/ClickHouse/pull/34364) ([Vitaly Baranov](https://github.com/vitlibar)).
+* add HashMethodSingleLowCardinalityColumn::findKey, avoid crash. [#34506](https://github.com/ClickHouse/ClickHouse/pull/34506) ([DR](https://github.com/freedomDR)).
+
+#### Build/Testing/Packaging Improvement
+* Add action for published releases. [#32218](https://github.com/ClickHouse/ClickHouse/pull/32218) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Remove unbundled support. [#33690](https://github.com/ClickHouse/ClickHouse/pull/33690) ([Azat Khuzhin](https://github.com/azat)).
+* Some improvement over current build system. [#33695](https://github.com/ClickHouse/ClickHouse/pull/33695) ([Amos Bird](https://github.com/amosbird)).
+* Removed "Yandex ClickHouse" terms from descriptions. Change to default mirrors for packages. [#33745](https://github.com/ClickHouse/ClickHouse/pull/33745) ([Ilya Yatsishin](https://github.com/qoega)).
+* - Fix unconditional `--build-arg FROM_TAG=` docker argument - Add some tests for docker tests/ci. [#33751](https://github.com/ClickHouse/ClickHouse/pull/33751) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Disable dh_update_autotools_config that updates config.guess/config.sub in sources directory on build. It will be more deterministic in terms of different build hosts used as config.guess is provided with sources. [#33752](https://github.com/ClickHouse/ClickHouse/pull/33752) ([Ilya Yatsishin](https://github.com/qoega)).
+* clickhouse-test.deb is not used in stateless CI checks. [#33948](https://github.com/ClickHouse/ClickHouse/pull/33948) ([Ilya Yatsishin](https://github.com/qoega)).
+* - Add on-demand style-checker-aarch64 hosts - Run dockerpush CI jobs there. [#33954](https://github.com/ClickHouse/ClickHouse/pull/33954) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add back the missing `-Werror` flag globally. This fixes https://github.com/ClickHouse/ClickHouse/pull/33940#issuecomment-1020466537. [#33970](https://github.com/ClickHouse/ClickHouse/pull/33970) ([Amos Bird](https://github.com/amosbird)).
+* Separate base parts out of SystemLog. Common code can use system log without fully linking to Interpreters. This helps with errors like https://s3.amazonaws.com/clickhouse-builds/33970/49b229f9c781854861254350d3407f209fb99dfd/binary_splitted/build_log.log. [#33978](https://github.com/ClickHouse/ClickHouse/pull/33978) ([Amos Bird](https://github.com/amosbird)).
+* Fix broken dependencies tree building, improve tests. [#33983](https://github.com/ClickHouse/ClickHouse/pull/33983) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Add get_with_retries to a download helper - Use it un PRInfo class - Replace `labels_from_api` by `pr_event_from_api` - Use it in description check to have always actual body and labels. [#34012](https://github.com/ClickHouse/ClickHouse/pull/34012) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Fix style check for tags_stable.yml - Run StyleCheck always in PR - Mark `Run Check` as failed only for some cases. [#34283](https://github.com/ClickHouse/ClickHouse/pull/34283) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add verbosity to a style check. [#34289](https://github.com/ClickHouse/ClickHouse/pull/34289) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix previously wrong OK_SKIP_LABELS in run_check.py. [#34340](https://github.com/ClickHouse/ClickHouse/pull/34340) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Migrate docker images from Moscow timezone to UTC - Update ubuntu version for performance comparison from 18.04 to 20.04. [#34373](https://github.com/ClickHouse/ClickHouse/pull/34373) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Ensure that tests don't depend on the result of non-stable sorting of equal elements. Added equal items ranges randomization in debug after sort to prevent issues when we rely on equal items sort order. [#34393](https://github.com/ClickHouse/ClickHouse/pull/34393) ([Maksim Kita](https://github.com/kitaisreal)).
+* - Rebuild docker images on a daily base - Add `--all` flag to rebuild all images - Add `only_amd64` parameter for some images - Revert all workarounds for `only_amd64` images - Fix all broken images. [#34492](https://github.com/ClickHouse/ClickHouse/pull/34492) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix broken Hadoop tests after updated paths in an image. [#34556](https://github.com/ClickHouse/ClickHouse/pull/34556) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* I test compile ClickHouse without HDFS but failed, because the code in DiskHDFS doesn`t judge whether use HDFS. [#34573](https://github.com/ClickHouse/ClickHouse/pull/34573) ([zxealous](https://github.com/zxealous)).
+* Set timeout 40 minutes for fast tests. [#34614](https://github.com/ClickHouse/ClickHouse/pull/34614) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Reverts ClickHouse/ClickHouse[#34614](https://github.com/ClickHouse/ClickHouse/issues/34614). [#34622](https://github.com/ClickHouse/ClickHouse/pull/34622) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Rework version_helper, make it executable - Reimplement StorageSystemContributors.sh in version_helper - Create a release script. [#34641](https://github.com/ClickHouse/ClickHouse/pull/34641) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Fix path in workflows/release.yml - To be backported to branch 22.1. [#34646](https://github.com/ClickHouse/ClickHouse/pull/34646) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Fix lz4 compression for output. Closes [#31421](https://github.com/ClickHouse/ClickHouse/issues/31421). [#31862](https://github.com/ClickHouse/ClickHouse/pull/31862) ([Kruglov Pavel](https://github.com/Avogar)).
+* Create a function escapeForLDAPFilter and use it to escape characters '(' and ')' in a final_user_dn variable. [#33401](https://github.com/ClickHouse/ClickHouse/pull/33401) ([IlyaTsoi](https://github.com/IlyaTsoi)).
+* TODO. [#33492](https://github.com/ClickHouse/ClickHouse/pull/33492) ([huzhichengdd](https://github.com/huzhichengdd)).
+* Fix error `Bad cast from type ... to DB::DataTypeArray` which may happen when table has `Nested` column with dots in name, and default value is generated for it (e.g. during insert, when column is not listed). Continuation of [#28762](https://github.com/ClickHouse/ClickHouse/issues/28762). [#33588](https://github.com/ClickHouse/ClickHouse/pull/33588) ([Alexey Pavlenko](https://github.com/alexeypavlenko)).
+* Fix `Chunk should have AggregatedChunkInfo in GroupingAggregatedTransform` (in case of `optimize_aggregation_in_order=1`). [#33637](https://github.com/ClickHouse/ClickHouse/pull/33637) ([Azat Khuzhin](https://github.com/azat)).
+* Fix bug in zero copy replication which lead to data duplication in case of TTL move. Fixes [#33643](https://github.com/ClickHouse/ClickHouse/issues/33643). [#33642](https://github.com/ClickHouse/ClickHouse/pull/33642) ([alesapin](https://github.com/alesapin)).
+* Allow some queries with sorting, LIMIT BY, ARRAY JOIN and lambda functions. This closes [#7462](https://github.com/ClickHouse/ClickHouse/issues/7462). [#33675](https://github.com/ClickHouse/ClickHouse/pull/33675) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Correctly determine current database if `CREATE TEMPORARY TABLE AS SELECT` is queried inside a named HTTP session. This is a very rare use case. This closes [#8340](https://github.com/ClickHouse/ClickHouse/issues/8340). [#33676](https://github.com/ClickHouse/ClickHouse/pull/33676) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix mutation when table contains projections. This fixes [#33010](https://github.com/ClickHouse/ClickHouse/issues/33010) . This fixes [#33275](https://github.com/ClickHouse/ClickHouse/issues/33275) . [#33679](https://github.com/ClickHouse/ClickHouse/pull/33679) ([Amos Bird](https://github.com/amosbird)).
+* Throw exception when storage hdfs list directory failed. [#33724](https://github.com/ClickHouse/ClickHouse/pull/33724) ([LiuNeng](https://github.com/liuneng1994)).
+* Fix tiny race between count() and INSERT/merges/... in MergeTree (it is possible to return incorrect number of rows for SELECT with optimize_trivial_count_query). [#33753](https://github.com/ClickHouse/ClickHouse/pull/33753) ([Azat Khuzhin](https://github.com/azat)).
+* Fix bug of check table when creating data part with wide format and projection. [#33774](https://github.com/ClickHouse/ClickHouse/pull/33774) ([李扬](https://github.com/taiyang-li)).
+* Fix parsing query INSERT INTO ... VALUES SETTINGS ... (...), ... [#33776](https://github.com/ClickHouse/ClickHouse/pull/33776) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix bug in client that led to 'Connection reset by peer' in server. Closes [#33309](https://github.com/ClickHouse/ClickHouse/issues/33309). [#33790](https://github.com/ClickHouse/ClickHouse/pull/33790) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix usage of external dictionaries with `Redis` source and large number of keys. [#33804](https://github.com/ClickHouse/ClickHouse/pull/33804) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix schema inference for JSONEachRow and JSONCompactEachRow. [#33830](https://github.com/ClickHouse/ClickHouse/pull/33830) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix KeyCondition with no common types available. [#33833](https://github.com/ClickHouse/ClickHouse/pull/33833) ([Amos Bird](https://github.com/amosbird)).
+* Fix memory leak in `clickhouse-keeper` in case of compression is used (default). [#33840](https://github.com/ClickHouse/ClickHouse/pull/33840) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `replica is not readonly` logical error on `SYSTEM RESTORE REPLICA` query when replica is actually readonly. Fixes [#33806](https://github.com/ClickHouse/ClickHouse/issues/33806). [#33847](https://github.com/ClickHouse/ClickHouse/pull/33847) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix usage of sparse columns (which can be enabled by experimental setting `ratio_of_defaults_for_sparse_serialization`). [#33849](https://github.com/ClickHouse/ClickHouse/pull/33849) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix crash if sql user defined function is created with lambda with non identifier arguments. Closes [#33866](https://github.com/ClickHouse/ClickHouse/issues/33866). [#33868](https://github.com/ClickHouse/ClickHouse/pull/33868) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix potential race condition when doing remote disk read. cc @Jokser. [#33912](https://github.com/ClickHouse/ClickHouse/pull/33912) ([Amos Bird](https://github.com/amosbird)).
+* Aggregate function combinator `-If` did not correctly process `Nullable` filter argument. This closes [#27073](https://github.com/ClickHouse/ClickHouse/issues/27073). [#33920](https://github.com/ClickHouse/ClickHouse/pull/33920) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix parsing ZK metadata: now metadata from zookeeper compared with local metadata in canonical form. [#33933](https://github.com/ClickHouse/ClickHouse/pull/33933) ([sunny](https://github.com/sunny19930321)).
+* Fix usage of functions `array` and `tuple` with literal arguments in distributed queries. Previously it could lead to `Not found columns` exception. [#33938](https://github.com/ClickHouse/ClickHouse/pull/33938) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix crash while reading of nested tuples. Fixes [#33838](https://github.com/ClickHouse/ClickHouse/issues/33838). [#33956](https://github.com/ClickHouse/ClickHouse/pull/33956) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix parsing IPv6 from query parameter and fix IPv6 to string conversion. Closes [#33928](https://github.com/ClickHouse/ClickHouse/issues/33928). [#33971](https://github.com/ClickHouse/ClickHouse/pull/33971) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix segfault while parsing ORC file with corrupted footer. Closes [#33797](https://github.com/ClickHouse/ClickHouse/issues/33797). [#33984](https://github.com/ClickHouse/ClickHouse/pull/33984) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix bug which lead to inability for server to start when both replicated access storage and keeper are used. Introduced two settings for keeper socket timeout instead of settings from default user: `keeper_server.socket_receive_timeout_sec` and `keeper_server.socket_send_timeout_sec`. Fixes [#33973](https://github.com/ClickHouse/ClickHouse/issues/33973). [#33988](https://github.com/ClickHouse/ClickHouse/pull/33988) ([alesapin](https://github.com/alesapin)).
+* - Fixes `parallel_view_processing=0` not working when inserting into a table using `VALUES`. - Fixes `view_duration_ms` in the `query_views_log` not being set correctly for materialized views. [#34067](https://github.com/ClickHouse/ClickHouse/pull/34067) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix asynchronous inserts with `Native` format. [#34068](https://github.com/ClickHouse/ClickHouse/pull/34068) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed minor race condition that might cause "intersecting parts" error in extremely rare cases after ZooKeeper connection loss. [#34096](https://github.com/ClickHouse/ClickHouse/pull/34096) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix possible data race in StorageFile that was introduced in https://github.com/ClickHouse/ClickHouse/pull/33960. Closes [#34111](https://github.com/ClickHouse/ClickHouse/issues/34111). [#34113](https://github.com/ClickHouse/ClickHouse/pull/34113) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix inserts to distributed tables in case of change of native protocol. The last change was in the version version 22.1, so there may be some failures of inserts to distributed tables after upgrade to that version. [#34132](https://github.com/ClickHouse/ClickHouse/pull/34132) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bug which can rarely lead to error "Cannot read all data" while reading LowCardinality columns of MergeTree table engines family which stores data on remote file system like S3. [#34139](https://github.com/ClickHouse/ClickHouse/pull/34139) ([alesapin](https://github.com/alesapin)).
+* Fix rare and benign race condition in `HDFS`, `S3` and `URL` storage engines which can lead to additional connections. [#34172](https://github.com/ClickHouse/ClickHouse/pull/34172) ([alesapin](https://github.com/alesapin)).
+* Fix schema inference for table runction s3. [#34186](https://github.com/ClickHouse/ClickHouse/pull/34186) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix metric `Query`, which shows number of executing queries. In last several releases it was always 0. [#34224](https://github.com/ClickHouse/ClickHouse/pull/34224) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix reading of subcolumns with dots in their names. In particular fixed reading of `Nested` columns, if their element names contain dots (e.g ```Nested(`keys.name` String, `keys.id` UInt64, values UInt64)```). [#34228](https://github.com/ClickHouse/ClickHouse/pull/34228) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix memory leak in case of some Exception during query processing with `optimize_aggregation_in_order=1`. [#34234](https://github.com/ClickHouse/ClickHouse/pull/34234) ([Azat Khuzhin](https://github.com/azat)).
+* Fix current_user/current_address for interserver mode (Before this patch current_user/current_address will be preserved from the previous query). [#34263](https://github.com/ClickHouse/ClickHouse/pull/34263) ([Azat Khuzhin](https://github.com/azat)).
+* Fix progress bar width. It was incorrectly rounded to integer number of characters. [#34275](https://github.com/ClickHouse/ClickHouse/pull/34275) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fixed a couple of extremely rare race conditions that might lead to broken state of replication queue and "intersecting parts" error. [#34297](https://github.com/ClickHouse/ClickHouse/pull/34297) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix various issues when projection is enabled by default. Each issue is described in separate commit. This is for [#33678](https://github.com/ClickHouse/ClickHouse/issues/33678) . This fixes [#34273](https://github.com/ClickHouse/ClickHouse/issues/34273). [#34305](https://github.com/ClickHouse/ClickHouse/pull/34305) ([Amos Bird](https://github.com/amosbird)).
+* Try to fix rare bug while reading of empty arrays, which could lead to `Data compressed with different methods` error. [#34327](https://github.com/ClickHouse/ClickHouse/pull/34327) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix wrong engine syntax in result of `SHOW CREATE DATABASE` query for databases with engine `Memory`. This closes [#34335](https://github.com/ClickHouse/ClickHouse/issues/34335). [#34345](https://github.com/ClickHouse/ClickHouse/pull/34345) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* For SQLUserDefinedFunctions change privilege level from DATABASE to GLOBAL. Closes [#34281](https://github.com/ClickHouse/ClickHouse/issues/34281). [#34404](https://github.com/ClickHouse/ClickHouse/pull/34404) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix segfault in schema inference from url. Closes [#34147](https://github.com/ClickHouse/ClickHouse/issues/34147). [#34405](https://github.com/ClickHouse/ClickHouse/pull/34405) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible error 'Cannot convert column Function to mask' in short circuit function evaluation. Closes [#34171](https://github.com/ClickHouse/ClickHouse/issues/34171). [#34415](https://github.com/ClickHouse/ClickHouse/pull/34415) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add missing lock for storage. Fixes possible race with table deletion. [#34416](https://github.com/ClickHouse/ClickHouse/pull/34416) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix possible error 'file_size: Operation not supported'. [#34479](https://github.com/ClickHouse/ClickHouse/pull/34479) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix compression support in URL engine. [#34524](https://github.com/ClickHouse/ClickHouse/pull/34524) ([Frank Chen](https://github.com/FrankChen021)).
+* Fix comparison between integers and floats in index analysis. Previously it could lead to skipping some granules for reading by mistake. Fixes [#34493](https://github.com/ClickHouse/ClickHouse/issues/34493). [#34528](https://github.com/ClickHouse/ClickHouse/pull/34528) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix exception `Chunk should have AggregatedChunkInfo in MergingAggregatedTransform` (in case of `optimize_aggregation_in_order=1` and `distributed_aggregation_memory_efficient=0`). Fixes [#34526](https://github.com/ClickHouse/ClickHouse/issues/34526). [#34532](https://github.com/ClickHouse/ClickHouse/pull/34532) ([Anton Popov](https://github.com/CurtizJ)).
+* In case of cancelation S3 and HDFS canceled only current reader, but continued to execute the initial query. Fixes [#34301](https://github.com/ClickHouse/ClickHouse/issues/34301) Relates to [#34397](https://github.com/ClickHouse/ClickHouse/issues/34397). [#34539](https://github.com/ClickHouse/ClickHouse/pull/34539) ([Dmitry Novik](https://github.com/novikd)).
+* Fix bug of round/roundBankers, close [#33267](https://github.com/ClickHouse/ClickHouse/issues/33267). [#34562](https://github.com/ClickHouse/ClickHouse/pull/34562) ([李扬](https://github.com/taiyang-li)).
+* Fixed the assertion in case of using `allow_experimental_parallel_reading_from_replicas` with `max_parallel_replicas` equals to 1. This fixes [#34525](https://github.com/ClickHouse/ClickHouse/issues/34525). [#34613](https://github.com/ClickHouse/ClickHouse/pull/34613) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* - Add Debug workflow to get variables for all actions on demand - Fix lack of pr_info.number for some edge case. [#34644](https://github.com/ClickHouse/ClickHouse/pull/34644) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Additionally check remote_fs_execute_merges_on_single_replica_time_threshold inside ReplicatedMergeTreeQueue"'. [#34201](https://github.com/ClickHouse/ClickHouse/pull/34201) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Add func tests run with s3"'. [#34211](https://github.com/ClickHouse/ClickHouse/pull/34211) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Add pool to WriteBufferFromS3"'. [#34212](https://github.com/ClickHouse/ClickHouse/pull/34212) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Add support agreement page and snippets.'. [#34512](https://github.com/ClickHouse/ClickHouse/pull/34512) ([Tom Risse](https://github.com/flickerbox-tom)).
+* NO CL ENTRY:  'Add Gigasheet to adopters'. [#34589](https://github.com/ClickHouse/ClickHouse/pull/34589) ([Brian Hunter](https://github.com/bjhunter)).
+
+#### NO CL CATEGORY
+
+* Reverting to previous docker images, will take a closer look at failing tests from [#34373](https://github.com/ClickHouse/ClickHouse/issues/34373). [#34413](https://github.com/ClickHouse/ClickHouse/pull/34413) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.2.2.1-stable.md b/docs/changelogs/v22.2.2.1-stable.md
new file mode 100644
index 00000000000..c9158290753
--- /dev/null
+++ b/docs/changelogs/v22.2.2.1-stable.md
@@ -0,0 +1,2 @@
+### ClickHouse release v22.2.2.1-stable FIXME as compared to v22.2.1.2139-prestable
+
diff --git a/docs/changelogs/v22.2.3.5-stable.md b/docs/changelogs/v22.2.3.5-stable.md
new file mode 100644
index 00000000000..90c0d22d570
--- /dev/null
+++ b/docs/changelogs/v22.2.3.5-stable.md
@@ -0,0 +1,6 @@
+### ClickHouse release v22.2.3.5-stable FIXME as compared to v22.2.2.1-stable
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#34848](https://github.com/ClickHouse/ClickHouse/issues/34848): Fix possible failures in S2 functions when queries contain const columns. [#34745](https://github.com/ClickHouse/ClickHouse/pull/34745) ([Bharat Nallan](https://github.com/bharatnc)).
+
diff --git a/docs/changelogs/v22.3.1.1262-prestable.md b/docs/changelogs/v22.3.1.1262-prestable.md
new file mode 100644
index 00000000000..f47afd67021
--- /dev/null
+++ b/docs/changelogs/v22.3.1.1262-prestable.md
@@ -0,0 +1,146 @@
+### ClickHouse release v22.3.1.1262-prestable FIXME as compared to v22.2.1.2139-prestable
+
+#### Backward Incompatible Change
+* Improvement the toDatetime function overflows. When the date string is very large, it will be converted to 1970. [#32898](https://github.com/ClickHouse/ClickHouse/pull/32898) ([HaiBo Li](https://github.com/marising)).
+* Make arrayCompact behave as other higher-order functions: perform compaction not of lambda function results but on original array. If you using nontrivial lambda functions in arrayCompact you may restore old behaviour by wrapping arrayCompact arguments into arrayMap. Closes [#34010](https://github.com/ClickHouse/ClickHouse/issues/34010) [#18535](https://github.com/ClickHouse/ClickHouse/issues/18535) [#14778](https://github.com/ClickHouse/ClickHouse/issues/14778). [#34795](https://github.com/ClickHouse/ClickHouse/pull/34795) ([Alexandre Snarskii](https://github.com/snar)).
+
+#### New Feature
+* New data type `Object(<schema_format>)`, which supports storing of semi-structured data (for now JSON only). Data is written to such types as string. Then all paths are extracted according to format of semi-structured data and written as separate columns in most optimal types, that can store all their values. Those columns can be queried by names that match paths in source data. E.g `data.key1.key2` or with cast operator `data.key1.key2::Int64`. [#23932](https://github.com/ClickHouse/ClickHouse/pull/23932) ([Anton Popov](https://github.com/CurtizJ)).
+* Support authentication of users connected via SSL by their X.509 certificate. [#31484](https://github.com/ClickHouse/ClickHouse/pull/31484) ([eungenue](https://github.com/eungenue)).
+* related to issue: [#30715](https://github.com/ClickHouse/ClickHouse/issues/30715). Add three functions for map data type: 1. mapReplace(map1, map2) - replaces values for keys in map1 with the values of the corresponding keys in map2; adds keys from map2 that don't exist in map1. 2. mapFilter 3. mapMap mapFilter and mapMap are higher order functions , accept two arguments, first argument is a lambda function with k, v pair , the second argument is a map type column. [#33698](https://github.com/ClickHouse/ClickHouse/pull/33698) ([hexiaoting](https://github.com/hexiaoting)).
+* Add local cache for disk s3. Closes [#28961](https://github.com/ClickHouse/ClickHouse/issues/28961). [#33717](https://github.com/ClickHouse/ClickHouse/pull/33717) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* - Add startsWith & endsWith function for arrays, closes [#33982](https://github.com/ClickHouse/ClickHouse/issues/33982). [#34368](https://github.com/ClickHouse/ClickHouse/pull/34368) ([usurai](https://github.com/usurai)).
+* Implement DateTime64 transform from and to arrow column, which closes [#8280](https://github.com/ClickHouse/ClickHouse/issues/8280) and closes [#28574](https://github.com/ClickHouse/ClickHouse/issues/28574). [#34561](https://github.com/ClickHouse/ClickHouse/pull/34561) ([李扬](https://github.com/taiyang-li)).
+* Add cpu/mem metric for clickhouse-local. Close [#34545](https://github.com/ClickHouse/ClickHouse/issues/34545). [#34605](https://github.com/ClickHouse/ClickHouse/pull/34605) ([李扬](https://github.com/taiyang-li)).
+* Support schema inference for inserting into table functions file/hdfs/s3/url. [#34732](https://github.com/ClickHouse/ClickHouse/pull/34732) ([Kruglov Pavel](https://github.com/Avogar)).
+* A new settings called <allow_plaintext_password><allow_no_password> is added in server configuration which on/off insecure AUTH_TYPE plaintext-password and no_password. By default the property is set to true which means authType Plaintext_password & NO_password is allowed. [#34738](https://github.com/ClickHouse/ClickHouse/pull/34738) ([Heena Bansal](https://github.com/HeenaBansal2009)).
+* Add new table function `hive`, usage as follow ``` hive('<hive metastore url>', '<hive database>', '<hive table name>', '<columns definition>', '<partition columns>') ``` for example ``` SELECT * FROM hive('thrift://hivetest:9083', 'test', 'demo', '`id` Nullable(String), `score` Nullable(Int32), `day` Nullable(String)', 'day') ```. [#34946](https://github.com/ClickHouse/ClickHouse/pull/34946) ([lgbo](https://github.com/lgbo-ustc)).
+* - When use clickhouse-client logining, If user and password is not specified in command line or configuration file, get them from `CLICKHOUSE_USER` and `CLICKHOUSE_PASSWORD` environment variables. Close [#34538](https://github.com/ClickHouse/ClickHouse/issues/34538). [#34947](https://github.com/ClickHouse/ClickHouse/pull/34947) ([DR](https://github.com/freedomDR)).
+* Added date_time_input_format = 'best_effort_us'. Closes [#34799](https://github.com/ClickHouse/ClickHouse/issues/34799). [#34982](https://github.com/ClickHouse/ClickHouse/pull/34982) ([WenYao](https://github.com/Cai-Yao)).
+* Changed the Play UI to select a theme by the following priority: * 'theme' GET parameter * 'theme' in localStorage * According to OS preference (didn't work before). [#35068](https://github.com/ClickHouse/ClickHouse/pull/35068) ([peledni](https://github.com/peledni)).
+* ``` sql ) explain ast graph = 1 select * from system.parts;. [#35173](https://github.com/ClickHouse/ClickHouse/pull/35173) ([李扬](https://github.com/taiyang-li)).
+* Add `database_replicated_allow_only_replicated_engine` setting. When enabled, it only allowed to create `Replicated` tables in `Replicated` database. [#35214](https://github.com/ClickHouse/ClickHouse/pull/35214) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### Performance Improvement
+* Calling std::distance on large list will decrease performance, use a version in Node to substitute with more memory 80MB/1000w Nodes. The logic is: Every node is list has a version with type size_t, setting in insert or insertOrReplace method using the class member variable current_version. The version is only increase at enableSnapshot method. When doing a snapshot, call snapshotSizeWithVersion to get snapshot size and version(snapshot_up_to_version). When traversing the list, if node version is less then or equal to snapshot_up_to_version, then protects it from deleting if node version is bigger than snapshot_up_to_version, we can do anything to it. [#34486](https://github.com/ClickHouse/ClickHouse/pull/34486) ([zhanglistar](https://github.com/zhanglistar)).
+* Compaction of log store in Nuraft need acquire an inner lock which also used in normal commit process, so we delete useless logs in `compact` method of Changelog class in a background thread. See details on: https://github.com/ClickHouse-Extras/NuRaft/blob/1707a7572aa66ec5d0a2dbe2bf5effa3352e6b2d/src/handle_commit.cxx#L560. [#34534](https://github.com/ClickHouse/ClickHouse/pull/34534) ([zhanglistar](https://github.com/zhanglistar)).
+* Don't hold the latest snapshot in memory, instead, reading the snapshot if needed, sequence reading is fast to 200+MBps even on HDD using mmap system call. Writing snapshot data directly to disk using compression method without holding original data and compressed data in memory. [#34584](https://github.com/ClickHouse/ClickHouse/pull/34584) ([zhanglistar](https://github.com/zhanglistar)).
+* MergeTree improve insert performance replacing std::stable_sort with pdqsort. [#34750](https://github.com/ClickHouse/ClickHouse/pull/34750) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improve the performance of the `ANY` aggregation function by acting over batches. [#34760](https://github.com/ClickHouse/ClickHouse/pull/34760) ([Raúl Marín](https://github.com/Algunenano)).
+* Improve performance of `detectCharset `, `detectLanguageUnknown ` functions. Improve performance of `DirectDictionary` if dictionary source is `ClickHouse`. Improve performance of processing queries with large `IN` section. [#34888](https://github.com/ClickHouse/ClickHouse/pull/34888) ([Maksim Kita](https://github.com/kitaisreal)).
+* Less lock on connection using atomic stat. Notice that it is an approximate stat. [#35010](https://github.com/ClickHouse/ClickHouse/pull/35010) ([zhanglistar](https://github.com/zhanglistar)).
+
+#### Improvement
+* Make the znode ctime and mtime consistent between servers. [#33441](https://github.com/ClickHouse/ClickHouse/pull/33441) ([小路](https://github.com/nicelulu)).
+* Hold time lock while assigning tasks to clear old temporary directories in StorageMergeTree. [#34025](https://github.com/ClickHouse/ClickHouse/pull/34025) ([Amos Bird](https://github.com/amosbird)).
+* When large files were written with `s3` table function or table engine, the content type on the files was mistakenly set to `application/xml` due to a bug in the AWS SDK. This closes [#33964](https://github.com/ClickHouse/ClickHouse/issues/33964). [#34433](https://github.com/ClickHouse/ClickHouse/pull/34433) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve schema inference with globs in FIle/S3/HDFS/URL engines. Try to use the next path for schema inference in case of error. [#34465](https://github.com/ClickHouse/ClickHouse/pull/34465) ([Kruglov Pavel](https://github.com/Avogar)).
+* - Improve the opentelemetry span logs for INSERT operation on distributed table. [#34480](https://github.com/ClickHouse/ClickHouse/pull/34480) ([Frank Chen](https://github.com/FrankChen021)).
+* MaterializedMySQL support materialized_mysql_tables_list(a comma-separated list of mysql database tables, which will be replicated by MaterializedMySQL database engine. Default value: empty list — means whole tables will be replicated) settings, mentioned at [#32977](https://github.com/ClickHouse/ClickHouse/issues/32977). [#34487](https://github.com/ClickHouse/ClickHouse/pull/34487) ([zzsmdfj](https://github.com/zzsmdfj)).
+* This PR changes restrictive row policies a bit to make them an easier alternative to permissive policies in easy cases. If for a particular table only restrictive policies exist (without permissive policies) users will be able to see some rows. Also `SHOW CREATE ROW POLICY` will always show `AS permissive` or `AS restrictive` in row policy's definition. [#34596](https://github.com/ClickHouse/ClickHouse/pull/34596) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add `encodeURLComponent`, 'encodeURLFormComponent' function. Closes [#31092](https://github.com/ClickHouse/ClickHouse/issues/31092). [#34607](https://github.com/ClickHouse/ClickHouse/pull/34607) ([zzsmdfj](https://github.com/zzsmdfj)).
+* Now you can read `system.zookeeper` table without restrictions on path or using `like` expression. This reads can generate quite heavy load for zookeeper so to enable this ability you have to enable setting `allow_unrestricted_reads_from_keeper`. [#34609](https://github.com/ClickHouse/ClickHouse/pull/34609) ([Sergei Trifonov](https://github.com/serxa)).
+* Some refactoring and improvement over async and remote buffer related stuff. Separated in each commit. [#34629](https://github.com/ClickHouse/ClickHouse/pull/34629) ([Amos Bird](https://github.com/amosbird)).
+* ExecutableUserDefinedFunctions allow to specify argument names. This is necessary for formats where argument name is part of serialization, like `Native`, `JSONEachRow`. Closes [#34604](https://github.com/ClickHouse/ClickHouse/issues/34604). [#34653](https://github.com/ClickHouse/ClickHouse/pull/34653) ([Maksim Kita](https://github.com/kitaisreal)).
+* Extract schema only once on table creation and prevent reading from local files/external sources to extract schema on each server startup. [#34684](https://github.com/ClickHouse/ClickHouse/pull/34684) ([Kruglov Pavel](https://github.com/Avogar)).
+* Do not reset logging that configured via --log-file/--errorlog-file in case of empty logger.log/logger.errorlog. [#34718](https://github.com/ClickHouse/ClickHouse/pull/34718) ([Amos Bird](https://github.com/amosbird)).
+* Support `remote()`/`cluster()` for `parallel_distributed_insert_select=2`. [#34728](https://github.com/ClickHouse/ClickHouse/pull/34728) ([Azat Khuzhin](https://github.com/azat)).
+* Add name hints for data skipping indices. Closes [#29698](https://github.com/ClickHouse/ClickHouse/issues/29698). [#34764](https://github.com/ClickHouse/ClickHouse/pull/34764) ([flynn](https://github.com/ucasfl)).
+* Now `ALTER TABLE DROP COLUMN columnX` queries for `MergeTree` table engines will work instantly when `columnX` is `ALIAS` column. Fixes [#34660](https://github.com/ClickHouse/ClickHouse/issues/34660). [#34786](https://github.com/ClickHouse/ClickHouse/pull/34786) ([alesapin](https://github.com/alesapin)).
+* In previous versions the progress bar in clickhouse-client can jump forward near 50% for no reason. This closes [#34324](https://github.com/ClickHouse/ClickHouse/issues/34324). [#34801](https://github.com/ClickHouse/ClickHouse/pull/34801) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix reading only columns which user asked for. Closes [#34163](https://github.com/ClickHouse/ClickHouse/issues/34163). [#34849](https://github.com/ClickHouse/ClickHouse/pull/34849) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Implement MemoryStatisticsOS for FreeBSD. [#34902](https://github.com/ClickHouse/ClickHouse/pull/34902) ([Alexandre Snarskii](https://github.com/snar)).
+* Allow to open empty sqlite db file if it does not exist. Closes [#33367](https://github.com/ClickHouse/ClickHouse/issues/33367). [#34907](https://github.com/ClickHouse/ClickHouse/pull/34907) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow LowCardinality strings for ngrambf_v1/tokenbf_v1 indexes. Closes [#21865](https://github.com/ClickHouse/ClickHouse/issues/21865). [#34911](https://github.com/ClickHouse/ClickHouse/pull/34911) ([Lars Hiller Eidnes](https://github.com/larspars)).
+* Ignore per-column `TTL` in `CREATE TABLE AS` if new table engine does not support it (i.e. if the engine is not of `MergeTree` family). [#34938](https://github.com/ClickHouse/ClickHouse/pull/34938) ([Azat Khuzhin](https://github.com/azat)).
+* Use connection pool for hive metastore client. [#34940](https://github.com/ClickHouse/ClickHouse/pull/34940) ([lgbo](https://github.com/lgbo-ustc)).
+* Currently, if the user changes the settings of the system tables there will be tons of logs and ClickHouse will rename the tables every minute. This fixes [#34929](https://github.com/ClickHouse/ClickHouse/issues/34929). [#34949](https://github.com/ClickHouse/ClickHouse/pull/34949) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* remove unnecessary columns for reading parquet/orc files. [#34954](https://github.com/ClickHouse/ClickHouse/pull/34954) ([lgbo](https://github.com/lgbo-ustc)).
+* For random access readbuffer in hive, the first time to read the readbuffer would use the original readbuffer instead of local file. When we read a parquet/orc format file, the readbuffer seeks to the end of the file, which will be blocked until the local file finishes download, and make the whold process slow. [#34957](https://github.com/ClickHouse/ClickHouse/pull/34957) ([lgbo](https://github.com/lgbo-ustc)).
+* Add more sanity checks for keeper configuration: now mixing of localhost and non-local servers is not allowed, also add checks for same value of internal raft port and keeper client port. [#35004](https://github.com/ClickHouse/ClickHouse/pull/35004) ([alesapin](https://github.com/alesapin)).
+* Functions `dictGetHierarchy`, `dictIsIn`, `dictGetChildren`, `dictGetDescendants` support implicit key cast and constant arguments. Closes [#34970](https://github.com/ClickHouse/ClickHouse/issues/34970). [#35027](https://github.com/ClickHouse/ClickHouse/pull/35027) ([Maksim Kita](https://github.com/kitaisreal)).
+* Avoid division by zero in Query Profiler if Linux kernel has a bug. Closes [#34787](https://github.com/ClickHouse/ClickHouse/issues/34787). [#35032](https://github.com/ClickHouse/ClickHouse/pull/35032) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Avoid possible `MEMORY_LIMIT_EXCEEDED` during `INSERT` into `Buffer` with `AggregateFunction`. [#35072](https://github.com/ClickHouse/ClickHouse/pull/35072) ([Azat Khuzhin](https://github.com/azat)).
+* Support `view()` for `parallel_distributed_insert_select`. [#35132](https://github.com/ClickHouse/ClickHouse/pull/35132) ([Azat Khuzhin](https://github.com/azat)).
+* Add setting to lower column case when reading parquet/ORC file. [#35145](https://github.com/ClickHouse/ClickHouse/pull/35145) ([shuchaome](https://github.com/shuchaome)).
+* Do not retry non-rertiable errors. Closes [#35161](https://github.com/ClickHouse/ClickHouse/issues/35161). [#35172](https://github.com/ClickHouse/ClickHouse/pull/35172) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Added disk_name to system.part_log. [#35178](https://github.com/ClickHouse/ClickHouse/pull/35178) ([Artyom Yurkov](https://github.com/Varinara)).
+* Currently,Clickhouse validates hosts defined under <remote_url_allow_hosts> for URL and Remote Table functions. This PR extends the RemoteHostFilter to Mysql and PostgreSQL table functions. [#35191](https://github.com/ClickHouse/ClickHouse/pull/35191) ([Heena Bansal](https://github.com/HeenaBansal2009)).
+* Sometimes it is not enough for us to distinguish queries hierachy only by is_initial_query in system.query_log and system.processes. So distributed_depth is needed. [#35207](https://github.com/ClickHouse/ClickHouse/pull/35207) ([李扬](https://github.com/taiyang-li)).
+* Support test mode for clickhouse-local. [#35264](https://github.com/ClickHouse/ClickHouse/pull/35264) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Return const for function getMacro if not in distributed query. Close [#34727](https://github.com/ClickHouse/ClickHouse/issues/34727). [#35289](https://github.com/ClickHouse/ClickHouse/pull/35289) ([李扬](https://github.com/taiyang-li)).
+* Reload `remote_url_allow_hosts` after config update. [#35294](https://github.com/ClickHouse/ClickHouse/pull/35294) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+#### Bug Fix
+* Ignore obsolete grants in ATTACH GRANT statements. This PR fixes [#34815](https://github.com/ClickHouse/ClickHouse/issues/34815). [#34855](https://github.com/ClickHouse/ClickHouse/pull/34855) ([Vitaly Baranov](https://github.com/vitlibar)).
+* When the inner readbuffer's buffer size is too small, NEED_MORE_INPUT in `HadoopSnappyDecoder` will run multi times (>=3)for one compressed block. This makes the input data be copied into the wrong place in `HadoopSnappyDecoder::buffer`. [#35116](https://github.com/ClickHouse/ClickHouse/pull/35116) ([lgbo](https://github.com/lgbo-ustc)).
+
+#### Build/Testing/Packaging Improvement
+* Randomize some settings in functional tests. This closes [#32268](https://github.com/ClickHouse/ClickHouse/issues/32268). [#34092](https://github.com/ClickHouse/ClickHouse/pull/34092) ([Kruglov Pavel](https://github.com/Avogar)).
+* NA. [#34513](https://github.com/ClickHouse/ClickHouse/pull/34513) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Debian package clickhouse-test.deb removed completely. CI use tests from repository and standalone testing via deb package is no longer supported. [#34606](https://github.com/ClickHouse/ClickHouse/pull/34606) ([Ilya Yatsishin](https://github.com/qoega)).
+* Set timeout 40 minutes for fast tests. [#34624](https://github.com/ClickHouse/ClickHouse/pull/34624) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Drop PVS test from CI. [#34680](https://github.com/ClickHouse/ClickHouse/pull/34680) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Limit DWARF version for debug info by 4 max, because our internal stack symbolizer cannot parse DWARF version 5. This makes sense if you compile ClickHouse with clang-15. [#34777](https://github.com/ClickHouse/ClickHouse/pull/34777) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve CI scripts arguments. [#34792](https://github.com/ClickHouse/ClickHouse/pull/34792) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Use @robot-clickhouse as an author and committer for PRs like https://github.com/ClickHouse/ClickHouse/pull/34685. [#34793](https://github.com/ClickHouse/ClickHouse/pull/34793) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Separate smaller clickhouse-keeper build. [#35031](https://github.com/ClickHouse/ClickHouse/pull/35031) ([alesapin](https://github.com/alesapin)).
+* Clion has the following problems "The breakpoint will not currently be hit. No executable code is associated with this line". [#35179](https://github.com/ClickHouse/ClickHouse/pull/35179) ([小路](https://github.com/nicelulu)).
+* Add an ability to build stripped binaries with cmake. [#35196](https://github.com/ClickHouse/ClickHouse/pull/35196) ([alesapin](https://github.com/alesapin)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Fix distributed subquery max_query_size limitation inconsistency. [#34078](https://github.com/ClickHouse/ClickHouse/pull/34078) ([Chao Ma](https://github.com/godliness)).
+* Fix incorrect trivial count result when part movement feature is used [#34089](https://github.com/ClickHouse/ClickHouse/issues/34089). [#34385](https://github.com/ClickHouse/ClickHouse/pull/34385) ([nvartolomei](https://github.com/nvartolomei)).
+* Stop to select part for mutate when the other replica has already updated the /log for ReplatedMergeTree engine. [#34633](https://github.com/ClickHouse/ClickHouse/pull/34633) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Fix `allow_experimental_projection_optimization` with `enable_global_with_statement` (before it may lead to `Stack size too large` error in case of multiple expressions in `WITH` clause, and also it executes scalar subqueries again and again, so not it will be more optimal). [#34650](https://github.com/ClickHouse/ClickHouse/pull/34650) ([Azat Khuzhin](https://github.com/azat)).
+* Fix serialization/printing for system queries `RELOAD MODEL`, `RELOAD FUNCTION`, `RESTART DISK` when used `ON CLUSTER`. Closes [#34514](https://github.com/ClickHouse/ClickHouse/issues/34514). [#34696](https://github.com/ClickHouse/ClickHouse/pull/34696) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix ENOENT with fsync_part_directory and Vertical merge. [#34739](https://github.com/ClickHouse/ClickHouse/pull/34739) ([Azat Khuzhin](https://github.com/azat)).
+* Fix bug for h3 funcs containing const columns which cause queries to fail. [#34743](https://github.com/ClickHouse/ClickHouse/pull/34743) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix possible failures in S2 functions when queries contain const columns. [#34745](https://github.com/ClickHouse/ClickHouse/pull/34745) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix bugs for multiple columns group by in WindowView. [#34859](https://github.com/ClickHouse/ClickHouse/pull/34859) ([vxider](https://github.com/Vxider)).
+* Support DDLs like CREATE USER to be executed on cross replicated cluster. [#34860](https://github.com/ClickHouse/ClickHouse/pull/34860) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Fix asynchronous inserts to table functions. Fixes [#34864](https://github.com/ClickHouse/ClickHouse/issues/34864). [#34866](https://github.com/ClickHouse/ClickHouse/pull/34866) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible "Part directory doesn't exist" during `INSERT`. [#34876](https://github.com/ClickHouse/ClickHouse/pull/34876) ([Azat Khuzhin](https://github.com/azat)).
+* Fix postgres datetime64 conversion. Closes [#33364](https://github.com/ClickHouse/ClickHouse/issues/33364). [#34910](https://github.com/ClickHouse/ClickHouse/pull/34910) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Avoid busy polling in keeper while searching for changelog files to delete. [#34931](https://github.com/ClickHouse/ClickHouse/pull/34931) ([Azat Khuzhin](https://github.com/azat)).
+* Unexpected result when use `in` in `where` in hive query. [#34945](https://github.com/ClickHouse/ClickHouse/pull/34945) ([lgbo](https://github.com/lgbo-ustc)).
+* Fix wrong schema inference for unquoted dates in CSV. Closes [#34768](https://github.com/ClickHouse/ClickHouse/issues/34768). [#34961](https://github.com/ClickHouse/ClickHouse/pull/34961) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible rare error `Cannot push block to port which already has data`. Avoid pushing to port with data inside `DelayedSource`. [#34993](https://github.com/ClickHouse/ClickHouse/pull/34993) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible segfault in filelog. Closes [#30749](https://github.com/ClickHouse/ClickHouse/issues/30749). [#34996](https://github.com/ClickHouse/ClickHouse/pull/34996) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix unexpected result when use -state type aggregate function in window frame. [#34999](https://github.com/ClickHouse/ClickHouse/pull/34999) ([metahys](https://github.com/metahys)).
+* Fix possible exception `Reading for MergeTree family tables must be done with last position boundary`. Closes [#34979](https://github.com/ClickHouse/ClickHouse/issues/34979). [#35001](https://github.com/ClickHouse/ClickHouse/pull/35001) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix reading from `system.asynchronous_inserts` table if there exists asynchronous insert into table function. [#35050](https://github.com/ClickHouse/ClickHouse/pull/35050) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix missing alias after function is optimized to subcolumn when setting `optimize_functions_to_subcolumns` is enabled. Closes [#33798](https://github.com/ClickHouse/ClickHouse/issues/33798). [#35079](https://github.com/ClickHouse/ClickHouse/pull/35079) ([qieqieplus](https://github.com/qieqieplus)).
+* Avoid possible deadlock on server shutdown. [#35081](https://github.com/ClickHouse/ClickHouse/pull/35081) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the "update_lag" external dictionary configuration option being unusable with the error message ``Unexpected key `update_lag` in dictionary source configuration``. [#35089](https://github.com/ClickHouse/ClickHouse/pull/35089) ([Jason Chu](https://github.com/1lann)).
+* fix issue: [#31469](https://github.com/ClickHouse/ClickHouse/issues/31469). [#35118](https://github.com/ClickHouse/ClickHouse/pull/35118) ([zzsmdfj](https://github.com/zzsmdfj)).
+* Fix `optimize_skip_unused_shards_rewrite_in` for signed columns and negative values. [#35134](https://github.com/ClickHouse/ClickHouse/pull/35134) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the incorrect translation YAML config to XML. [#35135](https://github.com/ClickHouse/ClickHouse/pull/35135) ([Miel Donkers](https://github.com/mdonkers)).
+* Fix partition pruning error when non-monotonic function is used with IN operator. This fixes [#35136](https://github.com/ClickHouse/ClickHouse/issues/35136). [#35146](https://github.com/ClickHouse/ClickHouse/pull/35146) ([Amos Bird](https://github.com/amosbird)).
+* Fix materialised postrgesql adding new table to replication (ATTACH TABLE) after manually removing (DETACH TABLE). Closes [#33800](https://github.com/ClickHouse/ClickHouse/issues/33800). Closes [#34922](https://github.com/ClickHouse/ClickHouse/issues/34922). Closes [#34315](https://github.com/ClickHouse/ClickHouse/issues/34315). [#35158](https://github.com/ClickHouse/ClickHouse/pull/35158) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix materialised postgres `table overrides` for partition by, etc. Closes [#35048](https://github.com/ClickHouse/ClickHouse/issues/35048). [#35162](https://github.com/ClickHouse/ClickHouse/pull/35162) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Schema inference didn't work properly on case of `INSERT INTO FUNCTION s3(...) FROM ...`, it tried to read schema from s3 file instead of from select query. [#35176](https://github.com/ClickHouse/ClickHouse/pull/35176) ([Kruglov Pavel](https://github.com/Avogar)).
+* - Fix `replaceRegexpAll`, close [#35117](https://github.com/ClickHouse/ClickHouse/issues/35117). [#35182](https://github.com/ClickHouse/ClickHouse/pull/35182) ([Vladimir C](https://github.com/vdimir)).
+* Fix error in query with `WITH TOTALS` in case if `HAVING` returned empty result. This fixes [#33711](https://github.com/ClickHouse/ClickHouse/issues/33711). [#35186](https://github.com/ClickHouse/ClickHouse/pull/35186) ([Amos Bird](https://github.com/amosbird)).
+* * Fix reading port from config, close [#34776](https://github.com/ClickHouse/ClickHouse/issues/34776). [#35193](https://github.com/ClickHouse/ClickHouse/pull/35193) ([Vladimir C](https://github.com/vdimir)).
+* Make function `cast(value, 'IPv4')`, `cast(value, 'IPv6')` behave same as `toIPv4`, `toIPv6` functions. Changed behavior of incorrect IP address passed into functions `toIPv4`,` toIPv6`, now if invalid IP address passes into this functions exception will be raised, before this function return default value. Added functions `IPv4StringToNumOrDefault`, `IPv4StringToNumOrNull`, `IPv6StringToNumOrDefault`, `IPv6StringOrNull` `toIPv4OrDefault`, `toIPv4OrNull`, `toIPv6OrDefault`, `toIPv6OrNull`. Functions `IPv4StringToNumOrDefault `, `toIPv4OrDefault `, `toIPv6OrDefault ` should be used if previous logic relied on `IPv4StringToNum`, `toIPv4`, `toIPv6` returning default value for invalid address. Added setting `cast_ipv4_ipv6_default_on_conversion_error`, if this setting enabled, then IP address conversion functions will behave as before. Closes [#22825](https://github.com/ClickHouse/ClickHouse/issues/22825). Closes [#5799](https://github.com/ClickHouse/ClickHouse/issues/5799). Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#35240](https://github.com/ClickHouse/ClickHouse/pull/35240) ([Maksim Kita](https://github.com/kitaisreal)).
+* Wait for IDiskRemote thread pool properly. [#35257](https://github.com/ClickHouse/ClickHouse/pull/35257) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `CHECK TABLE` query in case when sparse columns are enabled in table. [#35274](https://github.com/ClickHouse/ClickHouse/pull/35274) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible Abort while using Brotli compression with a small `max_read_buffer_size` setting value. The bug was found in https://github.com/ClickHouse/ClickHouse/pull/35047. [#35281](https://github.com/ClickHouse/ClickHouse/pull/35281) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible segfault in JSONEachRow schema inference. [#35291](https://github.com/ClickHouse/ClickHouse/pull/35291) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible `Assertion 'position() != working_buffer.end()' failed` while using lzma compression with small `max_read_buffer_size` setting value. The bug was found in https://github.com/ClickHouse/ClickHouse/pull/35047. [#35295](https://github.com/ClickHouse/ClickHouse/pull/35295) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible segfault while using lz4 compression with a small max_read_buffer_size setting value. The bug was found in https://github.com/ClickHouse/ClickHouse/pull/35047. [#35296](https://github.com/ClickHouse/ClickHouse/pull/35296) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible `Assertion 'position() != working_buffer.end()' failed` while using bzip2 compression with small `max_read_buffer_size` setting value. The bug was found in https://github.com/ClickHouse/ClickHouse/pull/35047. [#35300](https://github.com/ClickHouse/ClickHouse/pull/35300) ([Kruglov Pavel](https://github.com/Avogar)).
+* - Fix partial merge join duplicate rows bug, close [#31009](https://github.com/ClickHouse/ClickHouse/issues/31009). [#35311](https://github.com/ClickHouse/ClickHouse/pull/35311) ([Vladimir C](https://github.com/vdimir)).
+* Fix segfault in Postgres database when getting create table query if database was created using named collections. Closes [#35312](https://github.com/ClickHouse/ClickHouse/issues/35312). [#35313](https://github.com/ClickHouse/ClickHouse/pull/35313) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug in S3 zero-copy replication which can lead to errors like `Found parts with the same min block and with the same max block as the missing part` after concurrent fetch/drop table. [#35348](https://github.com/ClickHouse/ClickHouse/pull/35348) ([alesapin](https://github.com/alesapin)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  '[ImgBot] Optimize images'. [#34590](https://github.com/ClickHouse/ClickHouse/pull/34590) ([imgbot[bot]](https://github.com/apps/imgbot)).
+* NO CL ENTRY:  'Revert "Allow restrictive row policies without permissive"'. [#34782](https://github.com/ClickHouse/ClickHouse/pull/34782) ([Vitaly Baranov](https://github.com/vitlibar)).
+* NO CL ENTRY:  'Revert "Remove "bugs" that do not exist anymore"'. [#35241](https://github.com/ClickHouse/ClickHouse/pull/35241) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Change timezone in Docker"'. [#35243](https://github.com/ClickHouse/ClickHouse/pull/35243) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Fix 00900_long_parquet_load"'. [#35301](https://github.com/ClickHouse/ClickHouse/pull/35301) ([Vladimir C](https://github.com/vdimir)).
+
diff --git a/docs/changelogs/v22.3.2.2-lts.md b/docs/changelogs/v22.3.2.2-lts.md
new file mode 100644
index 00000000000..fc37facc7af
--- /dev/null
+++ b/docs/changelogs/v22.3.2.2-lts.md
@@ -0,0 +1,6 @@
+### ClickHouse release v22.3.2.2-lts FIXME as compared to v22.3.1.1262-prestable
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Fix bug in S3 zero-copy replication which can lead to errors like `Found parts with the same min block and with the same max block as the missing part` after concurrent fetch/drop table. [#35348](https://github.com/ClickHouse/ClickHouse/pull/35348) ([alesapin](https://github.com/alesapin)).
+
diff --git a/docs/changelogs/v22.3.3.44-lts.md b/docs/changelogs/v22.3.3.44-lts.md
new file mode 100644
index 00000000000..4214512c533
--- /dev/null
+++ b/docs/changelogs/v22.3.3.44-lts.md
@@ -0,0 +1,14 @@
+### ClickHouse release v22.3.3.44-lts FIXME as compared to v22.3.2.2-lts
+
+#### Bug Fix
+* Backported in [#35928](https://github.com/ClickHouse/ClickHouse/issues/35928): Added settings `input_format_ipv4_default_on_conversion_error`, `input_format_ipv6_default_on_conversion_error` to allow insert of invalid ip address values as default into tables. Closes [#35726](https://github.com/ClickHouse/ClickHouse/issues/35726). [#35733](https://github.com/ClickHouse/ClickHouse/pull/35733) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#35415](https://github.com/ClickHouse/ClickHouse/issues/35415): Fix possible deadlock in cache. [#35378](https://github.com/ClickHouse/ClickHouse/pull/35378) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#35563](https://github.com/ClickHouse/ClickHouse/issues/35563): Fix cast into IPv4, IPv6 address in IN section. Fixes [#35528](https://github.com/ClickHouse/ClickHouse/issues/35528). [#35534](https://github.com/ClickHouse/ClickHouse/pull/35534) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#35783](https://github.com/ClickHouse/ClickHouse/issues/35783): Fix bug in conversion from custom types to string that could lead to segfault or unexpected error messages. Closes [#35752](https://github.com/ClickHouse/ClickHouse/issues/35752). [#35755](https://github.com/ClickHouse/ClickHouse/pull/35755) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#35881](https://github.com/ClickHouse/ClickHouse/issues/35881): Fixes parsing of the arguments of the functions `extract`. Fixes [#35751](https://github.com/ClickHouse/ClickHouse/issues/35751). [#35799](https://github.com/ClickHouse/ClickHouse/pull/35799) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Backported in [#35856](https://github.com/ClickHouse/ClickHouse/issues/35856): Respect only quota & period from groups, ignore shares (which are not really limit the number of the cores which can be used). [#35815](https://github.com/ClickHouse/ClickHouse/pull/35815) ([filimonov](https://github.com/filimonov)).
+* Backported in [#35938](https://github.com/ClickHouse/ClickHouse/issues/35938): Avoid processing per-column TTL multiple times. [#35820](https://github.com/ClickHouse/ClickHouse/pull/35820) ([Azat Khuzhin](https://github.com/azat)).
+
diff --git a/docs/changelogs/v22.3.4.20-lts.md b/docs/changelogs/v22.3.4.20-lts.md
new file mode 100644
index 00000000000..e746a8e3e0b
--- /dev/null
+++ b/docs/changelogs/v22.3.4.20-lts.md
@@ -0,0 +1,14 @@
+### ClickHouse release v22.3.4.20-lts FIXME as compared to v22.3.3.44-lts
+
+#### Build/Testing/Packaging Improvement
+* - Add `_le_` method for ClickHouseVersion - Fix auto_version for existing tag - docker_server now support getting version from tags - Add python unit tests to backport workflow. [#36028](https://github.com/ClickHouse/ClickHouse/pull/36028) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36244](https://github.com/ClickHouse/ClickHouse/issues/36244): Fix usage of quota with asynchronous inserts. [#35645](https://github.com/ClickHouse/ClickHouse/pull/35645) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#36240](https://github.com/ClickHouse/ClickHouse/issues/36240): Fix possible loss of subcolumns in type `Object`. [#35682](https://github.com/ClickHouse/ClickHouse/pull/35682) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#36242](https://github.com/ClickHouse/ClickHouse/issues/36242): Fix possible `Can't adjust last granule` exception while reading subcolumns of type `Object`. [#35687](https://github.com/ClickHouse/ClickHouse/pull/35687) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#35938](https://github.com/ClickHouse/ClickHouse/issues/35938): Avoid processing per-column TTL multiple times. [#35820](https://github.com/ClickHouse/ClickHouse/pull/35820) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#36147](https://github.com/ClickHouse/ClickHouse/issues/36147): Fix reading from `Kafka` tables when `kafka_num_consumers > 1` and `kafka_thread_per_consumer = 0`. Returns parallel & multithreaded reading, accidentally broken in 21.11. Closes [#35153](https://github.com/ClickHouse/ClickHouse/issues/35153). [#35973](https://github.com/ClickHouse/ClickHouse/pull/35973) ([filimonov](https://github.com/filimonov)).
+* Backported in [#36276](https://github.com/ClickHouse/ClickHouse/issues/36276): Fix reading of empty arrays in reverse order (in queries with descending sorting by prefix of primary key). [#36215](https://github.com/ClickHouse/ClickHouse/pull/36215) ([Anton Popov](https://github.com/CurtizJ)).
+
diff --git a/docs/changelogs/v22.3.5.5-lts.md b/docs/changelogs/v22.3.5.5-lts.md
new file mode 100644
index 00000000000..d1c42807f41
--- /dev/null
+++ b/docs/changelogs/v22.3.5.5-lts.md
@@ -0,0 +1,7 @@
+### ClickHouse release v22.3.5.5-lts FIXME as compared to v22.3.4.20-lts
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36525](https://github.com/ClickHouse/ClickHouse/issues/36525): Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#36674](https://github.com/ClickHouse/ClickHouse/issues/36674): Fix merges of wide parts with type `Object`. [#36637](https://github.com/ClickHouse/ClickHouse/pull/36637) ([Anton Popov](https://github.com/CurtizJ)).
+
diff --git a/docs/changelogs/v22.3.6.5-lts.md b/docs/changelogs/v22.3.6.5-lts.md
new file mode 100644
index 00000000000..70a81bbe9ad
--- /dev/null
+++ b/docs/changelogs/v22.3.6.5-lts.md
@@ -0,0 +1,7 @@
+### ClickHouse release v22.3.6.5-lts FIXME as compared to v22.3.5.5-lts
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36525](https://github.com/ClickHouse/ClickHouse/issues/36525): Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#36795](https://github.com/ClickHouse/ClickHouse/issues/36795): Fix vertical merges in wide parts. Previously an exception `There is no column` can be thrown during merge. [#36707](https://github.com/ClickHouse/ClickHouse/pull/36707) ([Anton Popov](https://github.com/CurtizJ)).
+
diff --git a/docs/changelogs/v22.4.1.2305-prestable.md b/docs/changelogs/v22.4.1.2305-prestable.md
new file mode 100644
index 00000000000..ffd11c7d9c4
--- /dev/null
+++ b/docs/changelogs/v22.4.1.2305-prestable.md
@@ -0,0 +1,239 @@
+### ClickHouse release v22.4.1.2305-prestable FIXME as compared to v22.3.1.1262-prestable
+
+#### Backward Incompatible Change
+* Function `yandexConsistentHash` (consistent hashing algorithm by Konstantin "kostik" Oblakov) is renamed to `kostikConsistentHash`. The old name is left as an alias for compatibility. Although this change is backward compatible, we may remove the alias in subsequent releases, that's why it's recommended to update the usages of this function in your apps. [#35553](https://github.com/ClickHouse/ClickHouse/pull/35553) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Do not allow SETTINGS after FORMAT for INSERT queries (there is compatibility setting `parser_settings_after_format_compact` to accept such queries, but it is turned OFF by default). [#35883](https://github.com/ClickHouse/ClickHouse/pull/35883) ([Azat Khuzhin](https://github.com/azat)).
+* Changed hashed path for cache files. [#36079](https://github.com/ClickHouse/ClickHouse/pull/36079) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### New Feature
+* Added support for transactions for simple `MergeTree` tables. This feature is highly experimental and not recommended for production. Part of [#22086](https://github.com/ClickHouse/ClickHouse/issues/22086). [#24258](https://github.com/ClickHouse/ClickHouse/pull/24258) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Added load balancing setting for [Zoo]Keeper client. Closes [#29617](https://github.com/ClickHouse/ClickHouse/issues/29617). [#30325](https://github.com/ClickHouse/ClickHouse/pull/30325) ([小路](https://github.com/nicelulu)).
+* New aggregation function groupSortedArray to obtain an array of first N values. [#34055](https://github.com/ClickHouse/ClickHouse/pull/34055) ([palegre-tiny](https://github.com/palegre-tiny)).
+* New functions minSampleSizeContinous and minSampleSizeConversion. [#34354](https://github.com/ClickHouse/ClickHouse/pull/34354) ([achimbab](https://github.com/achimbab)).
+* Profiling on Processors level (under `log_processors_profiles` setting, ClickHouse will write time that processor spent during execution/waiting for data to `system.processors_profile_log` table). [#34355](https://github.com/ClickHouse/ClickHouse/pull/34355) ([Azat Khuzhin](https://github.com/azat)).
+* Add `toEndOfMonth` function which rounds up a date or date with time to the last day of the month. [#33501](https://github.com/ClickHouse/ClickHouse/issues/33501). [#34394](https://github.com/ClickHouse/ClickHouse/pull/34394) ([Habibullah Oladepo](https://github.com/holadepo)).
+* Add `h3PointDistM`, `h3PointDistKm`, `h3PointDistRads`, `h3GetRes0Indexes`, `h3GetPentagonIndexes` functions. [#34568](https://github.com/ClickHouse/ClickHouse/pull/34568) ([Bharat Nallan](https://github.com/bharatnc)).
+* Introduce format `ProtobufList`. Fixes [#16436](https://github.com/ClickHouse/ClickHouse/issues/16436). [#35152](https://github.com/ClickHouse/ClickHouse/pull/35152) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* A dedicated small package for `clickhouse-keeper`. [#35308](https://github.com/ClickHouse/ClickHouse/pull/35308) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* added INTERPOLATE extension to the ORDER BY ... WITH FILL closes [#34903](https://github.com/ClickHouse/ClickHouse/issues/34903). [#35349](https://github.com/ClickHouse/ClickHouse/pull/35349) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Added functions `minSampleSizeContinous` and `minSampleSizeConversion`. Author @achimbab. [#35360](https://github.com/ClickHouse/ClickHouse/pull/35360) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added functions `arrayFirstOrNull`, `arrayLastOrNull`. Closes [#35238](https://github.com/ClickHouse/ClickHouse/issues/35238). [#35414](https://github.com/ClickHouse/ClickHouse/pull/35414) ([Maksim Kita](https://github.com/kitaisreal)).
+* Allow to write remote fs cache on all write operations. Add `system.remote_filesystem_cache` table. Add `drop remote filesystem cache` query. Add introspection for s3 metadata with `system.remote_data_paths` table. Closes [#34021](https://github.com/ClickHouse/ClickHouse/issues/34021). Add cache option for merges by adding mode `read_from_filesystem_cache_if_exists_otherwise_bypass_cache` (turned on by default for merges and can also be turned on by query setting with the same name). Rename cache related settings (`remote_fs_enable_cache -> enable_filesystem_cache`, etc). [#35475](https://github.com/ClickHouse/ClickHouse/pull/35475) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Added functions makeDate(year, month, day), makeDate32(year, month, day). [#35628](https://github.com/ClickHouse/ClickHouse/pull/35628) ([Alexander Gololobov](https://github.com/davenger)).
+* Added function `flattenTuple`. It receives nested named `Tuple` as an argument and returns a flatten `Tuple` which elements are the paths from the original `Tuple`. E.g.: `Tuple(a Int, Tuple(b Int, c Int)) -> Tuple(a Int, b Int, c Int)`. `flattenTuple` can be used to select all paths from type `Object` as separate columns. [#35690](https://github.com/ClickHouse/ClickHouse/pull/35690) ([Anton Popov](https://github.com/CurtizJ)).
+* Support new type of quota `WRITTEN BYTES` to limit amount of written bytes during insert queries. [#35736](https://github.com/ClickHouse/ClickHouse/pull/35736) ([Anton Popov](https://github.com/CurtizJ)).
+* Implementation of makeDateTime() and makeDateTIme64(). [#35934](https://github.com/ClickHouse/ClickHouse/pull/35934) ([Alexander Gololobov](https://github.com/davenger)).
+* Support '\G;' at the end of query for FORMAT Vertical. Closes [#36111](https://github.com/ClickHouse/ClickHouse/issues/36111). [#36130](https://github.com/ClickHouse/ClickHouse/pull/36130) ([yuuch](https://github.com/yuuch)).
+* Adding random salt and appending to password to generate password hash. [#36172](https://github.com/ClickHouse/ClickHouse/pull/36172) ([Rajkumar Varada](https://github.com/varadarajkumar)).
+* Add setting throw_if_no_data_to_insert. Closes [#36336](https://github.com/ClickHouse/ClickHouse/issues/36336). [#36345](https://github.com/ClickHouse/ClickHouse/pull/36345) ([flynn](https://github.com/ucasfl)).
+* Implement type inference for INSERT INTO function null(). Closes [#36334](https://github.com/ClickHouse/ClickHouse/issues/36334). [#36353](https://github.com/ClickHouse/ClickHouse/pull/36353) ([flynn](https://github.com/ucasfl)).
+* ... [#36436](https://github.com/ClickHouse/ClickHouse/pull/36436) ([Rich Raposa](https://github.com/rfraposa)).
+
+#### Performance Improvement
+* Speed up parts loading process of MergeTree to accelerate starting up of clickhouse-server. With this improvement, clickhouse-server was able to decrease starting up time from 75 minutes to 20 seconds, with 700k mergetree parts. [#32928](https://github.com/ClickHouse/ClickHouse/pull/32928) ([李扬](https://github.com/taiyang-li)).
+* Sizes of hash tables used during aggregation now collected and used in later queries to avoid hash tables resizes. [#33439](https://github.com/ClickHouse/ClickHouse/pull/33439) ([Nikita Taranov](https://github.com/nickitat)).
+* Multiple changes to improve ASOF join performance (1.2 - 1.6x as fast). It also adds support to use big integers. [#34733](https://github.com/ClickHouse/ClickHouse/pull/34733) ([Raúl Marín](https://github.com/Algunenano)).
+* URL storage engine now downloads multiple chunks in parallel if the endpoint supports HTTP Range. Two additional settings were added, `max_download_threads` and `max_download_buffer_size`, which control maximum number of threads a single query can use to download the file and the maximum number of bytes each thread can process. [#35150](https://github.com/ClickHouse/ClickHouse/pull/35150) ([Antonio Andelic](https://github.com/antonio2368)).
+* parallelization of multipart upload into S3 storage. [#35343](https://github.com/ClickHouse/ClickHouse/pull/35343) ([Sergei Trifonov](https://github.com/serxa)).
+* Improve performance of ASOF JOIN if key is native integer. [#35525](https://github.com/ClickHouse/ClickHouse/pull/35525) ([Maksim Kita](https://github.com/kitaisreal)).
+* A new query plan optimization. Evaluate functions after `ORDER BY` when possible. As an example, for a query `SELECT sipHash64(number) FROM numbers(1e8) ORDER BY number LIMIT 5`, function `sipHash64` would be evaluated after `ORDER BY` and `LIMIT`, which gives ~20x speed up. [#35623](https://github.com/ClickHouse/ClickHouse/pull/35623) ([Nikita Taranov](https://github.com/nickitat)).
+* narrow mutex scope when setenv LIBHDFS3_CONF related issue [#35292](https://github.com/ClickHouse/ClickHouse/issues/35292). [#35646](https://github.com/ClickHouse/ClickHouse/pull/35646) ([shuchaome](https://github.com/shuchaome)).
+* Improve performance of `hasAll` function using specializations for SSE and AVX2. Author @youennL-cs. [#35723](https://github.com/ClickHouse/ClickHouse/pull/35723) ([Maksim Kita](https://github.com/kitaisreal)).
+* - The explain statement of GLOBAL JOIN two distributed tables can speed up 100x: explain plan select ... from t1_dist global join t2_dist on ... explain pipeline select ... from t1_dist global join t2_dist on ... [#36055](https://github.com/ClickHouse/ClickHouse/pull/36055) ([何李夫](https://github.com/helifu)).
+* 2 optimizations: - Optimize trivail count hive query - Speed up hive query by caching metadata of hive file. [#36082](https://github.com/ClickHouse/ClickHouse/pull/36082) ([李扬](https://github.com/taiyang-li)).
+
+#### Improvement
+* ... [#21474](https://github.com/ClickHouse/ClickHouse/pull/21474) ([nvartolomei](https://github.com/nvartolomei)).
+* As talked in [issue 27025](https://github.com/ClickHouse/ClickHouse/issues/27025), there is an improvement of the HasAll function using SIMD instruction (SSE and AVX2). Gtest tests have also been added. [#27653](https://github.com/ClickHouse/ClickHouse/pull/27653) ([youennL-cs](https://github.com/youennL-cs)).
+* Proper support of setting `max_rows_to_read` in case of reading in order of sorting key and specified limit. Previously the exception `Limit for rows or bytes to read exceeded` could be thrown even if query actually requires to read less amount of rows. [#33230](https://github.com/ClickHouse/ClickHouse/pull/33230) ([Anton Popov](https://github.com/CurtizJ)).
+* INTERVAL improvement - can be used with `[MILLI|MICRO|NANO]SECOND`. Added `toStartOf[Milli|Micro|Nano]second()` functions. Added `[add|subtract][Milli|Micro|Nano]second()`. [#34353](https://github.com/ClickHouse/ClickHouse/pull/34353) ([Andrey Zvonov](https://github.com/zvonand)).
+* System log tables allow to specify COMMENT in ENGINE declaration. Closes [#33768](https://github.com/ClickHouse/ClickHouse/issues/33768). [#34536](https://github.com/ClickHouse/ClickHouse/pull/34536) ([Maksim Kita](https://github.com/kitaisreal)).
+* added sanity checks on server startup (available memory and disk space, max thread count, etc). [#34566](https://github.com/ClickHouse/ClickHouse/pull/34566) ([Sergei Trifonov](https://github.com/serxa)).
+* Use minmax index for orc/parquet file in Hive Engine. Related pr: https://github.com/ClickHouse-Extras/arrow/pull/10. [#34631](https://github.com/ClickHouse/ClickHouse/pull/34631) ([李扬](https://github.com/taiyang-li)).
+* If `port` is not specified in cluster configuration, default server port will be used. This closes [#34769](https://github.com/ClickHouse/ClickHouse/issues/34769). [#34772](https://github.com/ClickHouse/ClickHouse/pull/34772) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Added better error messages in case of connection failed to MySQL. Closes [#35128](https://github.com/ClickHouse/ClickHouse/issues/35128). [#35234](https://github.com/ClickHouse/ClickHouse/pull/35234) ([zzsmdfj](https://github.com/zzsmdfj)).
+* Add function `getTypeSerializationStreams`. For a specified type (which is detected from column), it returns an array with all the serialization substream paths. This function is useful mainly for developers. [#35290](https://github.com/ClickHouse/ClickHouse/pull/35290) ([李扬](https://github.com/taiyang-li)).
+* - wchc operation is expensive and should not be in the four_letter_word_white_list defaults. [#35320](https://github.com/ClickHouse/ClickHouse/pull/35320) ([zhangyuli1](https://github.com/zhangyuli1)).
+* Added an ability to specify cluster secret in replicated database. [#35333](https://github.com/ClickHouse/ClickHouse/pull/35333) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add a new kind of row policies named `simple`. Before this PR we had two kinds or row policies: `permissive` and `restrictive`. A `simple` row policy adds a new filter on a table without any side-effects like it was for permissive and restrictive policies. [#35345](https://github.com/ClickHouse/ClickHouse/pull/35345) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Remove testmode option, enable it unconditionally. [#35354](https://github.com/ClickHouse/ClickHouse/pull/35354) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* For table function `s3cluster` or `HDFSCluster` or `hive`, we can't get right `AccessType` by `StorageFactory::instance().getSourceAccessType(getStorageTypeName())`. This pr fix it. [#35365](https://github.com/ClickHouse/ClickHouse/pull/35365) ([李扬](https://github.com/taiyang-li)).
+* For lts releases packages will be pushed to both lts and stable repos. [#35382](https://github.com/ClickHouse/ClickHouse/pull/35382) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Support uuid for postgres engines. Closes [#35384](https://github.com/ClickHouse/ClickHouse/issues/35384). [#35403](https://github.com/ClickHouse/ClickHouse/pull/35403) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add arguments `--user`, `--password`, `--host`, `--port` for clickhouse-diagnostics. [#35422](https://github.com/ClickHouse/ClickHouse/pull/35422) ([李扬](https://github.com/taiyang-li)).
+* fix INSERT INTO table FROM INFILE does not display progress bar. [#35429](https://github.com/ClickHouse/ClickHouse/pull/35429) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Allow server to bind to low-numbered ports (e.g. 443). ClickHouse installation script will set `cap_net_bind_service` to the binary file. [#35451](https://github.com/ClickHouse/ClickHouse/pull/35451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add settings `input_format_orc_case_insensitive_column_matching`, `input_format_arrow_case_insensitive_column_matching`, and `input_format_parquet_case_insensitive_column_matching` which allows ClickHouse to use case insensitive matching of columns while reading data from ORC, Arrow or Parquet files. [#35459](https://github.com/ClickHouse/ClickHouse/pull/35459) ([Antonio Andelic](https://github.com/antonio2368)).
+* - Add explicit table info to the scan node of query plan and pipeline. [#35460](https://github.com/ClickHouse/ClickHouse/pull/35460) ([何李夫](https://github.com/helifu)).
+* Propagate query and session settings for distributed DDL queries. Setting `distributed_ddl_entry_format_version` is set to 2 by default now. [#35463](https://github.com/ClickHouse/ClickHouse/pull/35463) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add sizes of subcolumns to `system.parts_columns` table. [#35488](https://github.com/ClickHouse/ClickHouse/pull/35488) ([Anton Popov](https://github.com/CurtizJ)).
+* It was possible to get stack overflow in distributed queries if one of the settings `async_socket_for_remote` and `use_hedged_requests` is enabled while parsing very deeply nested data type (at least in debug build). Closes [#35509](https://github.com/ClickHouse/ClickHouse/issues/35509). [#35524](https://github.com/ClickHouse/ClickHouse/pull/35524) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improve pasting performance and compatibility of clickhouse-client. This helps [#35501](https://github.com/ClickHouse/ClickHouse/issues/35501). [#35541](https://github.com/ClickHouse/ClickHouse/pull/35541) ([Amos Bird](https://github.com/amosbird)).
+* Added a support for automatic schema inference to `s3Cluster` table function. Synced the signatures of `s3 ` and `s3Cluster`. [#35544](https://github.com/ClickHouse/ClickHouse/pull/35544) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Use multiple threads to download objects from S3. Downloading is controllable using `max_download_threads` and `max_download_buffer_size` settings. [#35571](https://github.com/ClickHouse/ClickHouse/pull/35571) ([Antonio Andelic](https://github.com/antonio2368)).
+* Deduce absolute hdfs config path. [#35572](https://github.com/ClickHouse/ClickHouse/pull/35572) ([李扬](https://github.com/taiyang-li)).
+* - Use some tweaks and heuristics to determine numbers, strings, arrays, tuples and maps in CSV, TSV and TSVRaw data formats. Add setting `input_format_csv_use_best_effort_in_schema_inference` for CSV format that enables/disables using these heuristics, if it's disabled, we treat everything as string. Add similar setting `input_format_tsv_use_best_effort_in_schema_inference` for TSV/TSVRaw format. These settings are enabled by default. - Add Maps support for schema inference in Values format. - Fix possible segfault in schema inference in Values format. - Allow to skip columns with unsupported types in Arrow/ORC/Parquet formats. Add corresponding settings for it: `input_format_{parquet|orc|arrow}_skip_columns_with_unsupported_types_in_schema_inference`. These settings are disabled by default. - Allow to convert a column with type Null to a Nullable column with all NULL values in Arrow/Parquet formats. - Allow to specify column names in schema inference via setting `column_names_for_schema_inference` for formats that don't contain column names (like CSV, TSV, JSONCompactEachRow, etc) - Fix schema inference in ORC/Arrow/Parquet formats in terms of working with Nullable columns. Previously all inferred types were not Nullable and it blocked reading Nullable columns from data, now it's fixed and all inferred types are always Nullable (because we cannot understand that column is Nullable or not by reading the schema). - Fix schema inference in Template format with CSV escaping rules. [#35582](https://github.com/ClickHouse/ClickHouse/pull/35582) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add parallel parsing and schema inference for format `JSONAsObject`. [#35592](https://github.com/ClickHouse/ClickHouse/pull/35592) ([Anton Popov](https://github.com/CurtizJ)).
+* Added support for schema inference for `hdfsCluster`. [#35602](https://github.com/ClickHouse/ClickHouse/pull/35602) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* - Improve the pipeline description for JOIN. [#35612](https://github.com/ClickHouse/ClickHouse/pull/35612) ([何李夫](https://github.com/helifu)).
+* Support schema inference for type `Object` in format `JSONEachRow`. Allow to convert columns of type `Map` to columns of type `Object`. [#35629](https://github.com/ClickHouse/ClickHouse/pull/35629) ([Anton Popov](https://github.com/CurtizJ)).
+* Add profile event counter `AsyncInsertBytes` about size of async INSERTs. [#35644](https://github.com/ClickHouse/ClickHouse/pull/35644) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Added `is_secure` column to `system.query_log` which denotes if the client is using a secure connection over TCP or HTTP. [#35705](https://github.com/ClickHouse/ClickHouse/pull/35705) ([Antonio Andelic](https://github.com/antonio2368)).
+* closes [#35641](https://github.com/ClickHouse/ClickHouse/issues/35641) Allow EPHEMERAL without explicit default expression. [#35706](https://github.com/ClickHouse/ClickHouse/pull/35706) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix send_logs_level for clickhouse local. Closes [#35653](https://github.com/ClickHouse/ClickHouse/issues/35653). [#35716](https://github.com/ClickHouse/ClickHouse/pull/35716) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improve columns ordering in schema inference for formats TSKV and JSONEachRow, closes [#35640](https://github.com/ClickHouse/ClickHouse/issues/35640). Don't stop schema inference when reading empty row in schema inference for formats TSKV and JSONEachRow. [#35724](https://github.com/ClickHouse/ClickHouse/pull/35724) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add new setting `input_format_json_read_bools_as_numbers` that allows to infer and parse bools as numbers in JSON input formats. It's enabled by default. Suggested by @alexey-milovidov. [#35735](https://github.com/ClickHouse/ClickHouse/pull/35735) ([Kruglov Pavel](https://github.com/Avogar)).
+* Respect remote_url_allow_hosts for hive. [#35743](https://github.com/ClickHouse/ClickHouse/pull/35743) ([李扬](https://github.com/taiyang-li)).
+* Support schema inference for insert select with using `input` table function. Get schema from insertion table instead of inferring it from the data in case of insert select from table functions that support schema inference. Closes [#35639](https://github.com/ClickHouse/ClickHouse/issues/35639). [#35760](https://github.com/ClickHouse/ClickHouse/pull/35760) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improve projection analysis to optimize trivial queries such as `count()`. [#35788](https://github.com/ClickHouse/ClickHouse/pull/35788) ([Amos Bird](https://github.com/amosbird)).
+* support ALTER TABLE t DETACH PARTITION (ALL). [#35794](https://github.com/ClickHouse/ClickHouse/pull/35794) ([awakeljw](https://github.com/awakeljw)).
+* Added an animation to the hourglass icon to indicate to the user that a query is running. [#35860](https://github.com/ClickHouse/ClickHouse/pull/35860) ([peledni](https://github.com/peledni)).
+* Now some `ALTER MODIFY COLUMN` queries for `Arrays` and `Nullable` types can be done at metadata level without mutations. For example, alter from `Array(Enum8('Option1'=1))` to `Array(Enum8('Option1'=1, 'Option2'=2))`. [#35882](https://github.com/ClickHouse/ClickHouse/pull/35882) ([alesapin](https://github.com/alesapin)).
+* Now it's not allowed to `ALTER TABLE ... RESET SETTING` for non-existing settings for MergeTree engines family. Fixes [#35816](https://github.com/ClickHouse/ClickHouse/issues/35816). [#35884](https://github.com/ClickHouse/ClickHouse/pull/35884) ([alesapin](https://github.com/alesapin)).
+* Improve settings configuration for s3 storage / table function. [#35915](https://github.com/ClickHouse/ClickHouse/pull/35915) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add some basic metrics to monitor engine=Kafka tables. [#35916](https://github.com/ClickHouse/ClickHouse/pull/35916) ([filimonov](https://github.com/filimonov)).
+* Now `kafka_num_consumers` can be bigger than amount of physical cores in case of low resource machine (less than 16 cores). [#35926](https://github.com/ClickHouse/ClickHouse/pull/35926) ([alesapin](https://github.com/alesapin)).
+* Update unixodbc to mitigate CVE-2018-7485. [#35943](https://github.com/ClickHouse/ClickHouse/pull/35943) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Require mutations for per-table TTL only when it had been changed. [#35953](https://github.com/ClickHouse/ClickHouse/pull/35953) ([Azat Khuzhin](https://github.com/azat)).
+* - Add `dns_max_consecutive_failures` setting to stop re-resolving cached DNS entries after a number of consecutive failures (5 by default). [#35956](https://github.com/ClickHouse/ClickHouse/pull/35956) ([Raúl Marín](https://github.com/Algunenano)).
+* ASTPartition::formatImpl should output ALL while executing ALTER TABLE t DETACH PARTITION ALL. [#35987](https://github.com/ClickHouse/ClickHouse/pull/35987) ([awakeljw](https://github.com/awakeljw)).
+* `clickhouse-keeper` starts answering 4-letter commands before getting the quorum. [#35992](https://github.com/ClickHouse/ClickHouse/pull/35992) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix wrong assertion in replxx which happens when navigating back the history when the first line of input is a newline. Mark as improvement because it only affects debug build. This fixes [#34511](https://github.com/ClickHouse/ClickHouse/issues/34511). [#36007](https://github.com/ClickHouse/ClickHouse/pull/36007) ([Amos Bird](https://github.com/amosbird)).
+* If someone writes DEFAULT NULL in table definition, make data type Nullable. [#35887](https://github.com/ClickHouse/ClickHouse/issues/35887). [#36058](https://github.com/ClickHouse/ClickHouse/pull/36058) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Added `thread_id` and `query_id` columns to `system.zookeeper_log` table. [#36074](https://github.com/ClickHouse/ClickHouse/pull/36074) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Auto assign numbers for Enum elements. [#36101](https://github.com/ClickHouse/ClickHouse/pull/36101) ([awakeljw](https://github.com/awakeljw)).
+* Reset thread name in `ThreadPool` to `ThreadPoolIdle` after job is done. This is to avoid displaying the old thread name for idle threads. This closes [#36114](https://github.com/ClickHouse/ClickHouse/issues/36114). [#36115](https://github.com/ClickHouse/ClickHouse/pull/36115) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support `UNSIGNED` modifier with unused parameters of `INT`. [#36126](https://github.com/ClickHouse/ClickHouse/pull/36126) ([awakeljw](https://github.com/awakeljw)).
+* Add support for atomic exchange in OSX. [#36133](https://github.com/ClickHouse/ClickHouse/pull/36133) ([Raúl Marín](https://github.com/Algunenano)).
+* Update the progress bar after receiving every ProfileEvents packet. This change must fix the showing of outdated profiling data in client. [#36202](https://github.com/ClickHouse/ClickHouse/pull/36202) ([Dmitry Novik](https://github.com/novikd)).
+* Check ORC/Parquet/Arrow format magic bytes before loading file in memory to prevent high memory usage in case of wrong file format. [#36209](https://github.com/ClickHouse/ClickHouse/pull/36209) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow queries `insert into function file(...) select from` for files with formats that don't support schema inference. For example: `insert into function file(data.json) select 42` - such query didn't work previously. [#36211](https://github.com/ClickHouse/ClickHouse/pull/36211) ([Kruglov Pavel](https://github.com/Avogar)).
+* Send both stdin data and data from query/data from infile in client. Previously client ignored stdin data in case of both sources were present. Closes [#36100](https://github.com/ClickHouse/ClickHouse/issues/36100). [#36254](https://github.com/ClickHouse/ClickHouse/pull/36254) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow missing columns for mongo storage. Closes [#36119](https://github.com/ClickHouse/ClickHouse/issues/36119). Closes [#26490](https://github.com/ClickHouse/ClickHouse/issues/26490). [#36272](https://github.com/ClickHouse/ClickHouse/pull/36272) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Input format parsers can synchronize after wrong value of `Bool` or `Map` data types (see the `input_format_allow_errors_*` settings). [#36333](https://github.com/ClickHouse/ClickHouse/pull/36333) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Check for harmful environment variables like `LD_PRELOAD` at startup. It makes sense in [Google Collab](https://colab.research.google.com/drive/1wzYn59PA9EDyra6356a8rUpwd3zUX0Zt?usp=sharing). This closes [#36340](https://github.com/ClickHouse/ClickHouse/issues/36340). [#36342](https://github.com/ClickHouse/ClickHouse/pull/36342) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix [#36307](https://github.com/ClickHouse/ClickHouse/issues/36307) [#35891](https://github.com/ClickHouse/ClickHouse/issues/35891) possible range issues in automatic assigned enums, also fix error message. [#36352](https://github.com/ClickHouse/ClickHouse/pull/36352) ([awakeljw](https://github.com/awakeljw)).
+* hex function support for Int128/Int256/UInt128/UInt256. [#36386](https://github.com/ClickHouse/ClickHouse/pull/36386) ([Memo](https://github.com/Joeywzr)).
+
+#### Bug Fix
+* Add type checking when create materialized view. Try to close: [#23684](https://github.com/ClickHouse/ClickHouse/issues/23684). [#24896](https://github.com/ClickHouse/ClickHouse/pull/24896) ([hexiaoting](https://github.com/hexiaoting)).
+* Avoid erasing columns from a block if it doesn't exist while reading data from Hive. [#35393](https://github.com/ClickHouse/ClickHouse/pull/35393) ([lgbo](https://github.com/lgbo-ustc)).
+* Added settings `input_format_ipv4_default_on_conversion_error`, `input_format_ipv6_default_on_conversion_error` to allow insert of invalid ip address values as default into tables. Closes [#35726](https://github.com/ClickHouse/ClickHouse/issues/35726). [#35733](https://github.com/ClickHouse/ClickHouse/pull/35733) ([Maksim Kita](https://github.com/kitaisreal)).
+* In FileSegmentsHolder::~FileSegmentsHolder(), when a segment is set to detach, it will assert its state is empty. However, in FileSegment::completeImpl(), when detach is set to true, its state may be PARTIALLY_DOWNLOADED_NO_CONTINUATION or SKIP_CACHE or PARTIALLY_DOWNLOADED, thus cause error in FileSegmentsHolder::~FileSegmentsHolder(). ``` if (file_segment->detached) { /// This file segment is not owned by cache, so it will be destructed /// at this point, therefore no completion required. assert(file_segment->state() == FileSegment::State::EMPTY); file_segment_it = file_segments.erase(current_file_segment_it); continue; } ```. [#36452](https://github.com/ClickHouse/ClickHouse/pull/36452) ([Han Shukai](https://github.com/KinderRiven)).
+
+#### Build/Testing/Packaging Improvement
+* Add backward compatibility check in stress test. Closes [#25088](https://github.com/ClickHouse/ClickHouse/issues/25088). [#27928](https://github.com/ClickHouse/ClickHouse/pull/27928) ([Kruglov Pavel](https://github.com/Avogar)).
+* - Migrate package building to nfpm - Deprecate `release` script in favor of `packages/build` - Build everything in clickhouse/binary-builder image (cleanup: clickhouse/deb-builder) - Add symbol stripping to cmake (todo: use $prefix/lib/$bin_dir/clickhouse/$binary.debug) - Fix issue with DWARF symbols - Add Alpine APK packages - Rename `alien` to `additional_pkgs`. [#33664](https://github.com/ClickHouse/ClickHouse/pull/33664) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a night scan and upload for coverity. [#34895](https://github.com/ClickHouse/ClickHouse/pull/34895) ([Boris Kuschel](https://github.com/bkuschel)).
+* - Switch to libcxx / libcxxabi from LLVM 14. [#34906](https://github.com/ClickHouse/ClickHouse/pull/34906) ([Raúl Marín](https://github.com/Algunenano)).
+* Add next batch of random settings in functional tests. [#35047](https://github.com/ClickHouse/ClickHouse/pull/35047) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix stress-test report in CI, now we upload the runlog with information about started stress tests only once. [#35093](https://github.com/ClickHouse/ClickHouse/pull/35093) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - [x] redo alpine image to use clean Dockerfile - [x] Create a script in tests/ci to build both ubuntu and alpine images - [x] Add clickhouse-keeper image (cc @nikitamikhaylov) - [x] Add build check to PullRequestCI - [x] Add a job to a ReleaseCI - [x] Add a job to MasterCI to build and push `clickhouse/clickhouse-server:head` and `clickhouse/clickhouse-keeper:head` images for each merged PR. [#35211](https://github.com/ClickHouse/ClickHouse/pull/35211) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Reverse `--no-prestable` key to match the logic. [#35372](https://github.com/ClickHouse/ClickHouse/pull/35372) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* All disabled tests run longer than 30 seconds. [#35413](https://github.com/ClickHouse/ClickHouse/pull/35413) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix copypaste error for clickhouse-keeper test. [#35428](https://github.com/ClickHouse/ClickHouse/pull/35428) ([zhangyuli1](https://github.com/zhangyuli1)).
+* Fix failed tests in: https://s3.amazonaws.com/clickhouse-test-reports/35422/32348779fd0bac5276727cfc01e75c625ecc69b9/fuzzer_astfuzzerubsan,actions//report.html. [#35439](https://github.com/ClickHouse/ClickHouse/pull/35439) ([李扬](https://github.com/taiyang-li)).
+* Apply black formatter to python code and add a per-commit check. [#35466](https://github.com/ClickHouse/ClickHouse/pull/35466) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a label to recognize a building task for every image. [#35583](https://github.com/ClickHouse/ClickHouse/pull/35583) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Clean-up after functional test 02167 ... [#35681](https://github.com/ClickHouse/ClickHouse/pull/35681) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Minor improvement in contrib/krb5 build configuration. [#35832](https://github.com/ClickHouse/ClickHouse/pull/35832) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Update URL in test visualizer from `play-ci` to `play` (it was moved). [#35872](https://github.com/ClickHouse/ClickHouse/pull/35872) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Highlight headers in the PR template. Improve description checking logging. [#35947](https://github.com/ClickHouse/ClickHouse/pull/35947) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Running with podman is failing: it complains about specifying the same volume twice. [#35978](https://github.com/ClickHouse/ClickHouse/pull/35978) ([Roman Nikonov](https://github.com/nic11)).
+* Add argument for total number of desired builds. [#35999](https://github.com/ClickHouse/ClickHouse/pull/35999) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* - Add `_le_` method for ClickHouseVersion - Fix auto_version for an existing tag - docker_server now supports getting the version from tags - Add python unit tests to backport workflow - Move version_arg to version_helper, add tests. [#36029](https://github.com/ClickHouse/ClickHouse/pull/36029) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Significant improvement in docker build-cache system. [#36041](https://github.com/ClickHouse/ClickHouse/pull/36041) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* After CVE-2022-24765 git needs additional config parameter when directory is owned by another user. [#36193](https://github.com/ClickHouse/ClickHouse/pull/36193) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add an option for build profiling (`-ftime-trace`). [#36318](https://github.com/ClickHouse/ClickHouse/pull/36318) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Delete old packaging infrastructure. [#36330](https://github.com/ClickHouse/ClickHouse/pull/36330) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fallback to a default event in case of broken API. [#36412](https://github.com/ClickHouse/ClickHouse/pull/36412) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Check a number of required reports in BuilderSpecialReport. [#36413](https://github.com/ClickHouse/ClickHouse/pull/36413) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a labeling for `Revert` PRs. [#36422](https://github.com/ClickHouse/ClickHouse/pull/36422) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Disallow ALTER TTL for engines that does not support it, to avoid breaking ATTACH TABLE (closes [#33344](https://github.com/ClickHouse/ClickHouse/issues/33344)). [#33391](https://github.com/ClickHouse/ClickHouse/pull/33391) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Do not delay final part writing by default (fixes possible `Memory limit exceeded` during `INSERT` by adding `max_insert_delayed_streams_for_parallel_write` with default to 1000 for writes to s3 and disabled as before otherwise). [#34780](https://github.com/ClickHouse/ClickHouse/pull/34780) ([Azat Khuzhin](https://github.com/azat)).
+* fix issue：input_format_null_as_default does not work for DEFAULT expressions Closes [#34890](https://github.com/ClickHouse/ClickHouse/issues/34890). [#35039](https://github.com/ClickHouse/ClickHouse/pull/35039) ([zzsmdfj](https://github.com/zzsmdfj)).
+* Fix mutations in tables with enabled sparse columns. [#35284](https://github.com/ClickHouse/ClickHouse/pull/35284) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix schema inference for TSKV format while using small max_read_buffer_size. [#35332](https://github.com/ClickHouse/ClickHouse/pull/35332) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix partition pruning in case of comparison with constant in `WHERE`. If column and constant had different types, overflow was possible. Query could return an incorrect empty result. This fixes [#35304](https://github.com/ClickHouse/ClickHouse/issues/35304). [#35334](https://github.com/ClickHouse/ClickHouse/pull/35334) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug in S3 zero-copy replication which can lead to errors like `Found parts with the same min block and with the same max block as the missing part` after concurrent fetch/drop table. [#35348](https://github.com/ClickHouse/ClickHouse/pull/35348) ([alesapin](https://github.com/alesapin)).
+* Fix issue with non-existing directory https://github.com/ClickHouse/ClickHouse/runs/5588046879?check_suite_focus=true. [#35376](https://github.com/ClickHouse/ClickHouse/pull/35376) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix possible deadlock in cache. [#35378](https://github.com/ClickHouse/ClickHouse/pull/35378) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix wrong assets path in release workflow. [#35379](https://github.com/ClickHouse/ClickHouse/pull/35379) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Cache fixes for high concurrency on corner cases. [#35381](https://github.com/ClickHouse/ClickHouse/pull/35381) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix working with columns that are not needed in query in Arrow/Parquet/ORC formats, it prevents possible errors like `Unsupported <format> type <type> of an input column <column_name>` when file contains column with unsupported type and we don't use it in query. [#35406](https://github.com/ClickHouse/ClickHouse/pull/35406) ([Kruglov Pavel](https://github.com/Avogar)).
+* Skip empty chunks in GroupingAggregatedTransform. [#35417](https://github.com/ClickHouse/ClickHouse/pull/35417) ([Nikita Taranov](https://github.com/nickitat)).
+* Now merges executed with zero copy replication will not spam logs with message `Found parts with the same min block and with the same max block as the missing part _ on replica _. Hoping that it will eventually appear as a result of a merge.`. [#35430](https://github.com/ClickHouse/ClickHouse/pull/35430) ([alesapin](https://github.com/alesapin)).
+* Fix excessive logging when using S3 as backend for MergeTree or as separate table engine/function. Fixes [#30559](https://github.com/ClickHouse/ClickHouse/issues/30559). [#35434](https://github.com/ClickHouse/ClickHouse/pull/35434) ([alesapin](https://github.com/alesapin)).
+* Fix wrong result of datetime64 when negative. Close [#34831](https://github.com/ClickHouse/ClickHouse/issues/34831). [#35440](https://github.com/ClickHouse/ClickHouse/pull/35440) ([李扬](https://github.com/taiyang-li)).
+* Fix bug in function `if` when resulting column type differs with resulting data type that led to logical errors like `Logical error: 'Bad cast from type DB::ColumnVector<int> to DB::ColumnVector<long>'.`. Closes [#35367](https://github.com/ClickHouse/ClickHouse/issues/35367). [#35476](https://github.com/ClickHouse/ClickHouse/pull/35476) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix bug in Keeper which can lead to unstable client connections. Introduced in [#35031](https://github.com/ClickHouse/ClickHouse/issues/35031). [#35498](https://github.com/ClickHouse/ClickHouse/pull/35498) ([alesapin](https://github.com/alesapin)).
+* Fix crash for function `throwIf` with constant arguments. [#35500](https://github.com/ClickHouse/ClickHouse/pull/35500) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix crash during short circuit function evaluation when one of arguments is nullable constant. Closes [#35497](https://github.com/ClickHouse/ClickHouse/issues/35497). Closes [#35496](https://github.com/ClickHouse/ClickHouse/issues/35496). [#35502](https://github.com/ClickHouse/ClickHouse/pull/35502) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix cast into IPv4, IPv6 address in IN section. Fixes [#35528](https://github.com/ClickHouse/ClickHouse/issues/35528). [#35534](https://github.com/ClickHouse/ClickHouse/pull/35534) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix parsing of IPv6 addresses longer than 39 characters. Closes [#34022](https://github.com/ClickHouse/ClickHouse/issues/34022). [#35539](https://github.com/ClickHouse/ClickHouse/pull/35539) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed return type deduction for `caseWithExpression`. The type of the ELSE branch is now correctly taken into account. [#35576](https://github.com/ClickHouse/ClickHouse/pull/35576) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix s3 engine getting virtual columns. Closes [#35411](https://github.com/ClickHouse/ClickHouse/issues/35411). [#35586](https://github.com/ClickHouse/ClickHouse/pull/35586) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix version string setting in version_helper.py. [#35589](https://github.com/ClickHouse/ClickHouse/pull/35589) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix headers with named collections, add compression_method. Closes [#35273](https://github.com/ClickHouse/ClickHouse/issues/35273). Closes [#35269](https://github.com/ClickHouse/ClickHouse/issues/35269). [#35593](https://github.com/ClickHouse/ClickHouse/pull/35593) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Setting `database_atomic_wait_for_drop_and_detach_synchronously` worked incorrectly for `ATTACH TABLE` query when previously detached table is still in use, It's fixed. [#35594](https://github.com/ClickHouse/ClickHouse/pull/35594) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix possible segfault in materialised postgresql which happened if exception occurred when data, collected in memory, was synced into underlying tables. Closes [#35611](https://github.com/ClickHouse/ClickHouse/issues/35611). [#35614](https://github.com/ClickHouse/ClickHouse/pull/35614) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix `HashJoin` when columns with `LowCardinality` type are used. This closes [#35548](https://github.com/ClickHouse/ClickHouse/issues/35548). [#35616](https://github.com/ClickHouse/ClickHouse/pull/35616) ([Antonio Andelic](https://github.com/antonio2368)).
+* Check remote_url_allow_hosts before schema inference in URL engine Closes [#35064](https://github.com/ClickHouse/ClickHouse/issues/35064). [#35619](https://github.com/ClickHouse/ClickHouse/pull/35619) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix positional arguments with aliases. Closes [#35600](https://github.com/ClickHouse/ClickHouse/issues/35600). [#35620](https://github.com/ClickHouse/ClickHouse/pull/35620) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix projection analysis which might lead to wrong query result when IN subquery is used. This fixes [#35336](https://github.com/ClickHouse/ClickHouse/issues/35336). [#35631](https://github.com/ClickHouse/ClickHouse/pull/35631) ([Amos Bird](https://github.com/amosbird)).
+* Fix usage of quota with asynchronous inserts. [#35645](https://github.com/ClickHouse/ClickHouse/pull/35645) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix server crash when large number of arguments are passed into `format` function. Please refer to the test file and see how to reproduce the crash. [#35651](https://github.com/ClickHouse/ClickHouse/pull/35651) ([Amos Bird](https://github.com/amosbird)).
+* Fix part checking logic for parts with projections. Error happened when projection and main part had different types. This is similar to https://github.com/ClickHouse/ClickHouse/pull/33774 . The bug is addressed by @caoyang10. [#35667](https://github.com/ClickHouse/ClickHouse/pull/35667) ([Amos Bird](https://github.com/amosbird)).
+* Fix check asof join key nullability, close [#35565](https://github.com/ClickHouse/ClickHouse/issues/35565). [#35674](https://github.com/ClickHouse/ClickHouse/pull/35674) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible loss of subcolumns in type `Object`. [#35682](https://github.com/ClickHouse/ClickHouse/pull/35682) ([Anton Popov](https://github.com/CurtizJ)).
+* Enable build with JIT compilation by default. [#35683](https://github.com/ClickHouse/ClickHouse/pull/35683) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix possible `Can't adjust last granule` exception while reading subcolumns of type `Object`. [#35687](https://github.com/ClickHouse/ClickHouse/pull/35687) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bug in creating materialized view with subquery after server restart. Materialized view was not getting updated after inserts into underlying table after server restart. Closes [#35511](https://github.com/ClickHouse/ClickHouse/issues/35511). [#35691](https://github.com/ClickHouse/ClickHouse/pull/35691) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix dropping non-empty database in clickhouse local. Closes [#35692](https://github.com/ClickHouse/ClickHouse/issues/35692). [#35711](https://github.com/ClickHouse/ClickHouse/pull/35711) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix any/all(subquery) implementation. Closes [#35489](https://github.com/ClickHouse/ClickHouse/issues/35489). [#35727](https://github.com/ClickHouse/ClickHouse/pull/35727) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug in conversion from custom types to string that could lead to segfault or unexpected error messages. Closes [#35752](https://github.com/ClickHouse/ClickHouse/issues/35752). [#35755](https://github.com/ClickHouse/ClickHouse/pull/35755) ([Kruglov Pavel](https://github.com/Avogar)).
+* Now metadata for broken parts will be removed from metadata cache (introduced in [#32928](https://github.com/ClickHouse/ClickHouse/issues/32928)) on server start. [#35759](https://github.com/ClickHouse/ClickHouse/pull/35759) ([chen9t](https://github.com/chen9t)).
+* fix filebuffer pos in RemoteReadBuffer When RemoteReadBuffer is consumed, its pos will increase, for example in HadoopSnappyReadBuffer::nextImpl. ![image](https://user-images.githubusercontent.com/80669699/160880640-8535a701-63bd-42e9-a2c2-e5f215bcd96b.png). [#35771](https://github.com/ClickHouse/ClickHouse/pull/35771) ([shuchaome](https://github.com/shuchaome)).
+* Fixes parsing of the arguments of the functions `extract`. Fixes [#35751](https://github.com/ClickHouse/ClickHouse/issues/35751). [#35799](https://github.com/ClickHouse/ClickHouse/pull/35799) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix bug in indexes of not presented columns in -WithNames formats that led to error `INCORRECT_NUMBER_OF_COLUMNS ` when the number of columns is more than 256. Closes [#35793](https://github.com/ClickHouse/ClickHouse/issues/35793). [#35803](https://github.com/ClickHouse/ClickHouse/pull/35803) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix inserts to columns of type `Object` in case when there is data related to several partitions in insert query. [#35806](https://github.com/ClickHouse/ClickHouse/pull/35806) ([Anton Popov](https://github.com/CurtizJ)).
+* Respect only quota & period from groups, ignore shares (which are not really limit the number of the cores which can be used). [#35815](https://github.com/ClickHouse/ClickHouse/pull/35815) ([filimonov](https://github.com/filimonov)).
+* Avoid processing per-column TTL multiple times. [#35820](https://github.com/ClickHouse/ClickHouse/pull/35820) ([Azat Khuzhin](https://github.com/azat)).
+* fix issue: [#34966](https://github.com/ClickHouse/ClickHouse/issues/34966). [#35840](https://github.com/ClickHouse/ClickHouse/pull/35840) ([zzsmdfj](https://github.com/zzsmdfj)).
+* Disable `session_log` because memory safety issue has been found by fuzzing. See [#35714](https://github.com/ClickHouse/ClickHouse/issues/35714). [#35873](https://github.com/ClickHouse/ClickHouse/pull/35873) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix formatting of INSERT INFILE queries (missing quotes). [#35886](https://github.com/ClickHouse/ClickHouse/pull/35886) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed GA not reporting events. [#35935](https://github.com/ClickHouse/ClickHouse/pull/35935) ([peledni](https://github.com/peledni)).
+* Fix reading from `Kafka` tables when `kafka_num_consumers > 1` and `kafka_thread_per_consumer = 0`. Returns parallel & multithreaded reading, accidentally broken in 21.11. Closes [#35153](https://github.com/ClickHouse/ClickHouse/issues/35153). [#35973](https://github.com/ClickHouse/ClickHouse/pull/35973) ([filimonov](https://github.com/filimonov)).
+* Fix performance regression of scalar query optimization. [#35986](https://github.com/ClickHouse/ClickHouse/pull/35986) ([Amos Bird](https://github.com/amosbird)).
+* Fix error while moving table with `JOIN` engine from `Ordinary` database to `Atomic`, close [#35686](https://github.com/ClickHouse/ClickHouse/issues/35686). [#35995](https://github.com/ClickHouse/ClickHouse/pull/35995) ([Vladimir C](https://github.com/vdimir)).
+* Fix error `Empty list of columns in SELECT query` in CROSS JOIN close [#35672](https://github.com/ClickHouse/ClickHouse/issues/35672). [#36033](https://github.com/ClickHouse/ClickHouse/pull/36033) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible incorrect result of `WINDOW` functions in queries with `LIMIT` which was caused by wrong limit-push-down query plan optimization. Fixes [#36071](https://github.com/ClickHouse/ClickHouse/issues/36071) and [#23125](https://github.com/ClickHouse/ClickHouse/issues/23125). [#36075](https://github.com/ClickHouse/ClickHouse/pull/36075) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Throw an exception when CH cannot execute a file instead of displaying success and silently failing. [#36088](https://github.com/ClickHouse/ClickHouse/pull/36088) ([Julian Gilyadov](https://github.com/israelg99)).
+* Fix window view when is proc time and window kind larger than day, see code comment. [#36109](https://github.com/ClickHouse/ClickHouse/pull/36109) ([flynn](https://github.com/ucasfl)).
+* Fix bug of read buffer from hdfs. ReadBufferFromHDFSImpl::offset was misused as offset of working_buffer, but it is file offset. cc @kssenii. [#36153](https://github.com/ClickHouse/ClickHouse/pull/36153) ([李扬](https://github.com/taiyang-li)).
+* Fix crash in ParallelReadBuffer. [#36169](https://github.com/ClickHouse/ClickHouse/pull/36169) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow to convert empty strings to empty values of type `Objects`. [#36179](https://github.com/ClickHouse/ClickHouse/pull/36179) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible segfault in schema inference for JSON formats. [#36195](https://github.com/ClickHouse/ClickHouse/pull/36195) ([Kruglov Pavel](https://github.com/Avogar)).
+* `CREATE TABLE ... AS` might fail with `Replica ... already exists` even if `ReplicatedMergeTree` table was created with default arguments. It's fixed. Now `{uuid}` macro is not unfolded when saving table metadata. Therefore, it's not allowed to move `ReplicatedMergeTree` table from `Atomic` to `Ordinary` database if `zookeeper_path` contains `{uuid}` macro (or table was created with default engine arguments). Fixes [#35577](https://github.com/ClickHouse/ClickHouse/issues/35577). [#36200](https://github.com/ClickHouse/ClickHouse/pull/36200) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix reading of empty arrays in reverse order (in queries with descending sorting by prefix of primary key). [#36215](https://github.com/ClickHouse/ClickHouse/pull/36215) ([Anton Popov](https://github.com/CurtizJ)).
+* Play UI was not able to display some resultsets, for example `SELECT * FROM dish`. [#36283](https://github.com/ClickHouse/ClickHouse/pull/36283) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in ReadBufferFromHDFS in debug mode. <img width="1285" alt="image" src="https://user-images.githubusercontent.com/985418/163528606-6b2116de-a66b-4f71-b642-ed9afc7d7f0c.png">. [#36287](https://github.com/ClickHouse/ClickHouse/pull/36287) ([zhanglistar](https://github.com/zhanglistar)).
+* Fix "Cannot find column" error for distributed queries with LIMIT BY. [#36454](https://github.com/ClickHouse/ClickHouse/pull/36454) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "[WIP] New row policies"'. [#35454](https://github.com/ClickHouse/ClickHouse/pull/35454) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'remove ATOMIC_FLAG_INIT: depreciated in C++20 and warns in clang-14'. [#35785](https://github.com/ClickHouse/ClickHouse/pull/35785) ([Brendan Cox](https://github.com/justnoise)).
+* NO CL ENTRY:  'Revert "Added support for schema inference for `hdfsCluster`"'. [#35802](https://github.com/ClickHouse/ClickHouse/pull/35802) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* NO CL ENTRY:  '[Snyk] Security upgrade mkdocs from 1.1.2 to 1.3.0'. [#35864](https://github.com/ClickHouse/ClickHouse/pull/35864) ([Snyk bot](https://github.com/snyk-bot)).
+* NO CL ENTRY:  'Revert "Format changes for new docs"'. [#35894](https://github.com/ClickHouse/ClickHouse/pull/35894) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "clang-tidy report issues with Medium priority"'. [#35941](https://github.com/ClickHouse/ClickHouse/pull/35941) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Fix crash in ParallelReadBuffer"'. [#36210](https://github.com/ClickHouse/ClickHouse/pull/36210) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### Bug Fix (prestable release)
+
+* call RemoteQueryExecutor with original_query instead of an rewritten query, elimate the AMBIGUOUS_COLUMN_NAME exception. [#35748](https://github.com/ClickHouse/ClickHouse/pull/35748) ([lgbo](https://github.com/lgbo-ustc)).
+
diff --git a/docs/changelogs/v22.4.2.1-stable.md b/docs/changelogs/v22.4.2.1-stable.md
new file mode 100644
index 00000000000..c40bf8d92c9
--- /dev/null
+++ b/docs/changelogs/v22.4.2.1-stable.md
@@ -0,0 +1,6 @@
+### ClickHouse release v22.4.2.1-stable FIXME as compared to v22.4.1.2305-prestable
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Fix projection analysis which might lead to wrong query result when IN subquery is used. This fixes [#35336](https://github.com/ClickHouse/ClickHouse/issues/35336). [#35631](https://github.com/ClickHouse/ClickHouse/pull/35631) ([Amos Bird](https://github.com/amosbird)).
+
diff --git a/docs/changelogs/v22.4.3.3-stable.md b/docs/changelogs/v22.4.3.3-stable.md
new file mode 100644
index 00000000000..5ab7872f880
--- /dev/null
+++ b/docs/changelogs/v22.4.3.3-stable.md
@@ -0,0 +1,6 @@
+### ClickHouse release v22.4.3.3-stable FIXME as compared to v22.4.2.1-stable
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36582](https://github.com/ClickHouse/ClickHouse/issues/36582): Fix nullptr dereference in JOIN and COLUMNS matcher. This fixes [#36416](https://github.com/ClickHouse/ClickHouse/issues/36416) . This is for https://github.com/ClickHouse/ClickHouse/pull/36417. [#36430](https://github.com/ClickHouse/ClickHouse/pull/36430) ([Amos Bird](https://github.com/amosbird)).
+
diff --git a/docs/changelogs/v22.4.4.7-stable.md b/docs/changelogs/v22.4.4.7-stable.md
new file mode 100644
index 00000000000..794082328df
--- /dev/null
+++ b/docs/changelogs/v22.4.4.7-stable.md
@@ -0,0 +1,8 @@
+### ClickHouse release v22.4.4.7-stable FIXME as compared to v22.4.3.3-stable
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36524](https://github.com/ClickHouse/ClickHouse/issues/36524): Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#36582](https://github.com/ClickHouse/ClickHouse/issues/36582): Fix nullptr dereference in JOIN and COLUMNS matcher. This fixes [#36416](https://github.com/ClickHouse/ClickHouse/issues/36416) . This is for https://github.com/ClickHouse/ClickHouse/pull/36417. [#36430](https://github.com/ClickHouse/ClickHouse/pull/36430) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#36673](https://github.com/ClickHouse/ClickHouse/issues/36673): Fix merges of wide parts with type `Object`. [#36637](https://github.com/ClickHouse/ClickHouse/pull/36637) ([Anton Popov](https://github.com/CurtizJ)).
+
diff --git a/docs/changelogs/v22.4.5.9-stable.md b/docs/changelogs/v22.4.5.9-stable.md
new file mode 100644
index 00000000000..63dfd117816
--- /dev/null
+++ b/docs/changelogs/v22.4.5.9-stable.md
@@ -0,0 +1,9 @@
+### ClickHouse release v22.4.5.9-stable FIXME as compared to v22.4.4.7-stable
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36524](https://github.com/ClickHouse/ClickHouse/issues/36524): Queries with aliases inside special operators returned parsing error (was broken in 22.1). Example: `SELECT substring('test' AS t, 1, 1)`. [#36167](https://github.com/ClickHouse/ClickHouse/pull/36167) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#36635](https://github.com/ClickHouse/ClickHouse/issues/36635): Fix `Missing column` exception which could happen while using `INTERPOLATE` with `ENGINE = MergeTree` table. [#36549](https://github.com/ClickHouse/ClickHouse/pull/36549) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#36794](https://github.com/ClickHouse/ClickHouse/issues/36794): Fix vertical merges in wide parts. Previously an exception `There is no column` can be thrown during merge. [#36707](https://github.com/ClickHouse/ClickHouse/pull/36707) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#36926](https://github.com/ClickHouse/ClickHouse/issues/36926): Fix bug in clickhouse-keeper which can lead to corrupted compressed log files in case of small load and restarts. [#36910](https://github.com/ClickHouse/ClickHouse/pull/36910) ([alesapin](https://github.com/alesapin)).
+
diff --git a/docs/en/development/style.md b/docs/en/development/style.md
index 82cd9273680..35d124d1f15 100644
--- a/docs/en/development/style.md
+++ b/docs/en/development/style.md
@@ -694,6 +694,49 @@ auto s = std::string{"Hello"};
 
 **2.** Exception specifiers from C++03 are not used.
 
+**3.** Constructs which have convenient syntactic sugar in modern C++, e.g.
+
+```
+// Traditional way without syntactic sugar
+template <typename G, typename = std::enable_if_t<std::is_same<G, F>::value, void>> // SFINAE via std::enable_if, usage of ::value
+std::pair<int, int> func(const E<G> & e) // explicitly specified return type
+{
+    if (elements.count(e)) // .count() membership test
+    {
+        // ...
+    }
+
+    elements.erase(
+        std::remove_if(
+            elements.begin(), elements.end(),
+            [&](const auto x){
+                return x == 1;
+            }),
+        elements.end()); // remove-erase idiom
+
+    return std::make_pair(1, 2); // create pair via make_pair()
+}
+
+// With syntactic sugar (C++14/17/20)
+template <typename G>
+requires std::same_v<G, F> // SFINAE via C++20 concept, usage of C++14 template alias
+auto func(const E<G> & e) // auto return type (C++14)
+{
+    if (elements.contains(e)) // C++20 .contains membership test
+    {
+        // ...
+    }
+
+    elements.erase_if(
+        elements,
+        [&](const auto x){
+            return x == 1;
+        }); // C++20 std::erase_if
+
+    return {1, 2}; // or: return std::pair(1, 2); // create pair via initialization list or value initialization (C++17)
+}
+```
+
 ## Platform {#platform}
 
 **1.** We write code for a specific platform.
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 7779057bb74..4aba0506c2e 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -14,7 +14,7 @@ Each functional test sends one or multiple queries to the running ClickHouse ser
 
 Tests are located in `queries` directory. There are two subdirectories: `stateless` and `stateful`. Stateless tests run queries without any preloaded test data - they often create small synthetic datasets on the fly, within the test itself. Stateful tests require preloaded test data from CLickHouse and it is available to general public.
 
-Each test can be one of two types: `.sql` and `.sh`. `.sql` test is the simple SQL script that is piped to `clickhouse-client --multiquery --testmode`. `.sh` test is a script that is run by itself. SQL tests are generally preferable to `.sh` tests. You should use `.sh` tests only when you have to test some feature that cannot be exercised from pure SQL, such as piping some input data into `clickhouse-client` or testing `clickhouse-local`.
+Each test can be one of two types: `.sql` and `.sh`. `.sql` test is the simple SQL script that is piped to `clickhouse-client --multiquery`. `.sh` test is a script that is run by itself. SQL tests are generally preferable to `.sh` tests. You should use `.sh` tests only when you have to test some feature that cannot be exercised from pure SQL, such as piping some input data into `clickhouse-client` or testing `clickhouse-local`.
 
 ### Running a Test Locally {#functional-test-locally}
 
@@ -30,7 +30,7 @@ For more options, see `tests/clickhouse-test --help`. You can simply run all tes
 
 ### Adding a New Test
 
-To add new test, create a `.sql` or `.sh` file in `queries/0_stateless` directory, check it manually and then generate `.reference` file in the following way: `clickhouse-client -n --testmode < 00000_test.sql > 00000_test.reference` or `./00000_test.sh > ./00000_test.reference`.
+To add new test, create a `.sql` or `.sh` file in `queries/0_stateless` directory, check it manually and then generate `.reference` file in the following way: `clickhouse-client --multiquery < 00000_test.sql > 00000_test.reference` or `./00000_test.sh > ./00000_test.reference`.
 
 Tests should use (create, drop, etc) only tables in `test` database that is assumed to be created beforehand; also tests can use temporary tables.
 
diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index 2b49603bd0a..f31a78bc1c4 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -127,22 +127,22 @@ After that downloaded archives should be unpacked and installed with installatio
 LATEST_VERSION=$(curl -s https://packages.clickhouse.com/tgz/stable/ | \
     grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
 export LATEST_VERSION
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION.tgz"
-curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION.tgz"
+curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION-amd64.tgz"
+curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION-amd64.tgz"
+curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION-amd64.tgz"
+curl -O "https://packages.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION-amd64.tgz"
 
-tar -xzvf "clickhouse-common-static-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-common-static-$LATEST_VERSION-amd64.tgz"
 sudo "clickhouse-common-static-$LATEST_VERSION/install/doinst.sh"
 
-tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-common-static-dbg-$LATEST_VERSION-amd64.tgz"
 sudo "clickhouse-common-static-dbg-$LATEST_VERSION/install/doinst.sh"
 
-tar -xzvf "clickhouse-server-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-server-$LATEST_VERSION-amd64.tgz"
 sudo "clickhouse-server-$LATEST_VERSION/install/doinst.sh"
 sudo /etc/init.d/clickhouse-server start
 
-tar -xzvf "clickhouse-client-$LATEST_VERSION.tgz"
+tar -xzvf "clickhouse-client-$LATEST_VERSION-amd64.tgz"
 sudo "clickhouse-client-$LATEST_VERSION/install/doinst.sh"
 ```
 
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index f21858ccc25..e382bbcddd8 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -9,6 +9,7 @@ ClickHouse can accept and return data in various formats. A format supported for
 results of a `SELECT`, and to perform `INSERT`s into a file-backed table.
 
 The supported formats are:
+
 | Format                                                                                    | Input | Output |
 |-------------------------------------------------------------------------------------------|-------|--------|
 | [TabSeparated](#tabseparated)                                                             | ✔     | ✔      |
@@ -195,7 +196,7 @@ This format is also available under the name `TSVWithNames`.
 Differs from the `TabSeparated` format in that the column names are written to the first row, while the column types are in the second row.
 The first row with names is processed the same way as in `TabSeparatedWithNames` format.
 If setting [input_format_with_types_use_header](../operations/settings/settings.md#settings-input_format_with_types_use_header) is set to 1,
-the types from input data will be compared with the types of the corresponding columns from the table. Otherwise, the second row will be skipped. 
+the types from input data will be compared with the types of the corresponding columns from the table. Otherwise, the second row will be skipped.
 
 This format is also available under the name `TSVWithNamesAndTypes`.
 
@@ -790,7 +791,7 @@ The query `SELECT * FROM UserActivity FORMAT JSONEachRow` returns:
 
 Unlike the [JSON](#json) format, there is no substitution of invalid UTF-8 sequences. Values are escaped in the same way as for `JSON`.
 
-:::info    
+:::info
 Any set of bytes can be output in the strings. Use the `JSONEachRow` format if you are sure that the data in the table can be formatted as JSON without losing any information.
 :::
 
@@ -1414,7 +1415,7 @@ SET format_avro_schema_registry_url = 'http://schema-registry';
 SELECT * FROM topic1_stream;
 ```
 
-:::warning    
+:::warning
 Setting `format_avro_schema_registry_url` needs to be configured in `users.xml` to maintain it’s value after a restart. Also you can use the `format_avro_schema_registry_url` setting of the `Kafka` table engine.
 :::
 
@@ -1631,7 +1632,7 @@ When working with the `Regexp` format, you can use the following settings:
     -   Escaped (similarly to [TSV](#tabseparated))
     -   Quoted (similarly to [Values](#data-format-values))
     -   Raw (extracts subpatterns as a whole, no escaping rules, similarly to [TSVRaw](#tabseparatedraw))
-	
+
 -   `format_regexp_skip_unmatched` — [UInt8](../sql-reference/data-types/int-uint.md). Defines the need to throw an exeption in case the `format_regexp` expression does not match the imported data. Can be set to `0` or `1`.
 
 **Usage**
diff --git a/docs/en/interfaces/postgresql.md b/docs/en/interfaces/postgresql.md
new file mode 100644
index 00000000000..a7fd33b38c1
--- /dev/null
+++ b/docs/en/interfaces/postgresql.md
@@ -0,0 +1,72 @@
+---
+sidebar_position: 20
+sidebar_label: PostgreSQL Interface
+---
+
+# PostgreSQL Interface
+
+ClickHouse supports the PostgreSQL wire protocol, which allows you to use Postgres clients to connect to ClickHouse. In a sense, ClickHouse can pretend to be a PostgreSQL instance - allowing you to connect a PostgreSQL client application to ClickHouse that is not already directy supported by ClickHouse (for example, Amazon Redshift).
+
+To enable the PostgreSQL wire protocol, add the [postgresql_port](../operations/server-configuration-parameters/settings#server_configuration_parameters-postgresql_port) setting to your server's configuration file. For example, you could define the port in a new XML file in your `config.d` folder:
+
+```xml
+<clickhouse>
+	<postgresql_port>9005</postgresql_port>
+</clickhouse>
+```
+
+Startup your ClickHouse server and look for a log message similar to the following that mentions **Listening for PostgreSQL compatibility protocol**:
+
+```response
+{} <Information> Application: Listening for PostgreSQL compatibility protocol: 127.0.0.1:9005
+```
+
+## Connect psql to ClickHouse
+
+The following command demonstrates how to connect the PostgreSQL client `psql` to ClickHouse:
+
+```bash
+psql -p [port] -h [hostname] -U [username] [database_name]
+```
+
+For example:
+
+```bash
+psql -p 9005 -h 127.0.0.1 -U alice default
+```
+
+:::note
+The `psql` client requires a login with a password, so you will not be able connect using the `default` user with no password. Either assign a password to the `default` user, or login as a different user.
+:::
+
+The `psql` client prompts for the password:
+
+```response
+Password for user alice:
+psql (14.2, server 22.3.1.1)
+WARNING: psql major version 14, server major version 22.
+         Some psql features might not work.
+Type "help" for help.
+
+default=>
+```
+
+And that's it! You now have a PostgreSQL client connected to ClickHouse, and all commands and queries are executed on ClickHouse.
+
+:::caution
+The PostgreSQL protocol currently only supports plain-text passwords.
+:::
+
+## Using SSL
+
+If you have SSL/TLS configured on your ClickHouse instance, then `postgresql_port` will use the same settings (the port is shared for both secure and unsecure clients).
+
+Each client has their own method of how to connect using SSL. The following command demonstrates how to pass in the certificates and key to securely connect `psql` to ClickHouse:
+
+```bash
+psql "port=9005 host=127.0.0.1 user=alice dbname=default sslcert=/path/to/certificate.pem sslkey=/path/to/key.pem sslrootcert=/path/to/rootcert.pem sslmode=verify-ca"
+```
+
+View the [PostgreSQL docs](https://jdbc.postgresql.org/documentation/head/ssl-client.html) for more details on their SSL settings.
+
+[Original article](https://clickhouse.com/docs/en/interfaces/postgresql)
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index e4b1fdd3bbb..bd05f3b4ad2 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -13,7 +13,7 @@ Simhash is a hash function, which returns close hash values for close (similar)
 
 [Interprets](../../sql-reference/functions/type-conversion-functions.md#type_conversion_functions-reinterpretAsString) all the input parameters as strings and calculates the [MD5](https://en.wikipedia.org/wiki/MD5) hash value for each of them. Then combines hashes, takes the first 8 bytes of the hash of the resulting string, and interprets them as `UInt64` in big-endian byte order.
 
-``` sql
+```sql
 halfMD5(par1, ...)
 ```
 
@@ -30,11 +30,11 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 
 **Example**
 
-``` sql
+```sql
 SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type;
 ```
 
-``` text
+```response
 ┌────────halfMD5hash─┬─type───┐
 │ 186182704141653334 │ UInt64 │
 └────────────────────┴────────┘
@@ -54,7 +54,7 @@ If you want to get the same result as output by the md5sum utility, use lower(he
 
 Produces a 64-bit [SipHash](https://131002.net/siphash/) hash value.
 
-``` sql
+```sql
 sipHash64(par1,...)
 ```
 
@@ -77,11 +77,11 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 
 **Example**
 
-``` sql
+```sql
 SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type;
 ```
 
-``` text
+```response
 ┌──────────────SipHash─┬─type───┐
 │ 13726873534472839665 │ UInt64 │
 └──────────────────────┴────────┘
@@ -93,7 +93,7 @@ Produces a 128-bit [SipHash](https://131002.net/siphash/) hash value. Differs fr
 
 **Syntax**
 
-``` sql
+```sql
 sipHash128(par1,...)
 ```
 
@@ -111,13 +111,13 @@ Type: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
 
 Query:
 
-``` sql
+```sql
 SELECT hex(sipHash128('foo', '\x01', 3));
 ```
 
 Result:
 
-``` text
+```response
 ┌─hex(sipHash128('foo', '', 3))────┐
 │ 9DE516A64A414D4B1B609415E4523F24 │
 └──────────────────────────────────┘
@@ -127,7 +127,7 @@ Result:
 
 Produces a 64-bit [CityHash](https://github.com/google/cityhash) hash value.
 
-``` sql
+```sql
 cityHash64(par1,...)
 ```
 
@@ -145,11 +145,11 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 
 Call example:
 
-``` sql
+```sql
 SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type;
 ```
 
-``` text
+```response
 ┌─────────────CityHash─┬─type───┐
 │ 12072650598913549138 │ UInt64 │
 └──────────────────────┴────────┘
@@ -157,7 +157,7 @@ SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:0
 
 The following example shows how to compute the checksum of the entire table with accuracy up to the row order:
 
-``` sql
+```sql
 SELECT groupBitXor(cityHash64(*)) FROM table
 ```
 
@@ -177,7 +177,7 @@ Calculates SHA-1, SHA-224, SHA-256, SHA-512 hash from a string and returns the r
 
 **Syntax**
 
-``` sql
+```sql
 SHA1('s')
 ...
 SHA512('s')
@@ -203,24 +203,62 @@ Use the [hex](../functions/encoding-functions.md#hex) function to represent the
 
 Query:
 
-``` sql
+```sql
 SELECT hex(SHA1('abc'));
 ```
 
 Result:
 
-``` text
+```response
 ┌─hex(SHA1('abc'))─────────────────────────┐
 │ A9993E364706816ABA3E25717850C26C9CD0D89D │
 └──────────────────────────────────────────┘
 ```
 
+## BLAKE3 {#blake3}
+
+Calculates BLAKE3 hash string and returns the resulting set of bytes as [FixedString](../data-types/fixedstring.md).
+
+**Syntax**
+
+```sql
+BLAKE3('s')
+```
+
+This cryptographic hash-function is integrated into ClickHouse with BLAKE3 Rust library. The function is rather fast and shows approximately two times faster performance compared to SHA-2, while generating hashes of the same length as SHA-256.
+
+**Arguments**
+
+- s - input string for BLAKE3 hash calculation. [String](../data-types/string.md).
+
+**Return value**
+
+- BLAKE3 hash as a byte array with type FixedString(32).
+
+Type: [FixedString](../data-types/fixedstring.md).
+
+**Example**
+
+Use function [hex](../functions/encoding-functions.md#hex) to represent the result as a hex-encoded string.
+
+Query:
+```sql
+SELECT hex(BLAKE3('ABC'))
+```
+
+Result:
+```sql
+┌─hex(BLAKE3('ABC'))───────────────────────────────────────────────┐
+│ D1717274597CF0289694F75D96D444B992A096F1AFD8E7BBFA6EBB1D360FEDFC │
+└──────────────────────────────────────────────────────────────────┘
+```
+
 ## URLHash(url\[, N\]) {#urlhashurl-n}
 
 A fast, decent-quality non-cryptographic hash function for a string obtained from a URL using some type of normalization.
 `URLHash(s)` – Calculates a hash from a string without one of the trailing symbols `/`,`?` or `#` at the end, if present.
 `URLHash(s, N)` – Calculates a hash from a string up to the N level in the URL hierarchy, without one of the trailing symbols `/`,`?` or `#` at the end, if present.
-Levels are the same as in URLHierarchy. 
+Levels are the same as in URLHierarchy.
 
 ## farmFingerprint64 {#farmfingerprint64}
 
@@ -228,7 +266,7 @@ Levels are the same as in URLHierarchy.
 
 Produces a 64-bit [FarmHash](https://github.com/google/farmhash) or Fingerprint value. `farmFingerprint64` is preferred for a stable and portable value.
 
-``` sql
+```sql
 farmFingerprint64(par1, ...)
 farmHash64(par1, ...)
 ```
@@ -245,11 +283,11 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 
 **Example**
 
-``` sql
+```sql
 SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type;
 ```
 
-``` text
+```response
 ┌─────────────FarmHash─┬─type───┐
 │ 17790458267262532859 │ UInt64 │
 └──────────────────────┴────────┘
@@ -261,7 +299,7 @@ Calculates [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add97
 
 **Syntax**
 
-``` sql
+```sql
 SELECT javaHash('')
 ```
 
@@ -273,13 +311,13 @@ A `Int32` data type hash value.
 
 Query:
 
-``` sql
+```sql
 SELECT javaHash('Hello, world!');
 ```
 
 Result:
 
-``` text
+```response
 ┌─javaHash('Hello, world!')─┐
 │               -1880044555 │
 └───────────────────────────┘
@@ -291,7 +329,7 @@ Calculates [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add97
 
 **Syntax**
 
-``` sql
+```sql
 javaHashUTF16LE(stringUtf16le)
 ```
 
@@ -309,13 +347,13 @@ Correct query with UTF-16LE encoded string.
 
 Query:
 
-``` sql
+```sql
 SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'));
 ```
 
 Result:
 
-``` text
+```response
 ┌─javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))─┐
 │                                                      3556498 │
 └──────────────────────────────────────────────────────────────┘
@@ -325,7 +363,7 @@ Result:
 
 Calculates `HiveHash` from a string.
 
-``` sql
+```sql
 SELECT hiveHash('')
 ```
 
@@ -341,13 +379,13 @@ Type: `hiveHash`.
 
 Query:
 
-``` sql
+```sql
 SELECT hiveHash('Hello, world!');
 ```
 
 Result:
 
-``` text
+```response
 ┌─hiveHash('Hello, world!')─┐
 │                 267439093 │
 └───────────────────────────┘
@@ -357,7 +395,7 @@ Result:
 
 Produces a 64-bit [MetroHash](http://www.jandrewrogers.com/2015/05/27/metrohash/) hash value.
 
-``` sql
+```sql
 metroHash64(par1, ...)
 ```
 
@@ -371,11 +409,11 @@ A [UInt64](../../sql-reference/data-types/int-uint.md) data type hash value.
 
 **Example**
 
-``` sql
+```sql
 SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type;
 ```
 
-``` text
+```response
 ┌────────────MetroHash─┬─type───┐
 │ 14235658766382344533 │ UInt64 │
 └──────────────────────┴────────┘
@@ -391,7 +429,7 @@ For more information, see the link: [JumpConsistentHash](https://arxiv.org/pdf/1
 
 Produces a [MurmurHash2](https://github.com/aappleby/smhasher) hash value.
 
-``` sql
+```sql
 murmurHash2_32(par1, ...)
 murmurHash2_64(par1, ...)
 ```
@@ -407,11 +445,11 @@ Both functions take a variable number of input parameters. Arguments can be any
 
 **Example**
 
-``` sql
+```sql
 SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type;
 ```
 
-``` text
+```response
 ┌──────────MurmurHash2─┬─type───┐
 │ 11832096901709403633 │ UInt64 │
 └──────────────────────┴────────┘
@@ -423,7 +461,7 @@ Calculates a 64-bit [MurmurHash2](https://github.com/aappleby/smhasher) hash val
 
 **Syntax**
 
-``` sql
+```sql
 gccMurmurHash(par1, ...)
 ```
 
@@ -441,7 +479,7 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT
     gccMurmurHash(1, 2, 3) AS res1,
     gccMurmurHash(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2)))) AS res2
@@ -449,7 +487,7 @@ SELECT
 
 Result:
 
-``` text
+```response
 ┌─────────────────res1─┬────────────────res2─┐
 │ 12384823029245979431 │ 1188926775431157506 │
 └──────────────────────┴─────────────────────┘
@@ -459,7 +497,7 @@ Result:
 
 Produces a [MurmurHash3](https://github.com/aappleby/smhasher) hash value.
 
-``` sql
+```sql
 murmurHash3_32(par1, ...)
 murmurHash3_64(par1, ...)
 ```
@@ -475,11 +513,11 @@ Both functions take a variable number of input parameters. Arguments can be any
 
 **Example**
 
-``` sql
+```sql
 SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
-``` text
+```response
 ┌─MurmurHash3─┬─type───┐
 │     2152717 │ UInt32 │
 └─────────────┴────────┘
@@ -491,7 +529,7 @@ Produces a 128-bit [MurmurHash3](https://github.com/aappleby/smhasher) hash valu
 
 **Syntax**
 
-``` sql
+```sql
 murmurHash3_128(expr)
 ```
 
@@ -509,13 +547,13 @@ Type: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
 
 Query:
 
-``` sql
+```sql
 SELECT hex(murmurHash3_128('foo', 'foo', 'foo'));
 ```
 
 Result:
 
-``` text
+```response
 ┌─hex(murmurHash3_128('foo', 'foo', 'foo'))─┐
 │ F8F7AD9B6CD4CF117A71E277E2EC2931          │
 └───────────────────────────────────────────┘
@@ -525,7 +563,7 @@ Result:
 
 Calculates `xxHash` from a string. It is proposed in two flavors, 32 and 64 bits.
 
-``` sql
+```sql
 SELECT xxHash32('')
 
 OR
@@ -543,13 +581,13 @@ Type: `xxHash`.
 
 Query:
 
-``` sql
+```sql
 SELECT xxHash32('Hello, world!');
 ```
 
 Result:
 
-``` text
+```response
 ┌─xxHash32('Hello, world!')─┐
 │                 834093149 │
 └───────────────────────────┘
@@ -567,7 +605,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 ngramSimHash(string[, ngramsize])
 ```
 
@@ -586,13 +624,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT ngramSimHash('ClickHouse') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 1627567969 │
 └────────────┘
@@ -606,7 +644,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 ngramSimHashCaseInsensitive(string[, ngramsize])
 ```
 
@@ -625,13 +663,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT ngramSimHashCaseInsensitive('ClickHouse') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌──────Hash─┐
 │ 562180645 │
 └───────────┘
@@ -645,7 +683,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 ngramSimHashUTF8(string[, ngramsize])
 ```
 
@@ -664,13 +702,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT ngramSimHashUTF8('ClickHouse') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 1628157797 │
 └────────────┘
@@ -684,7 +722,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 ngramSimHashCaseInsensitiveUTF8(string[, ngramsize])
 ```
 
@@ -703,13 +741,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT ngramSimHashCaseInsensitiveUTF8('ClickHouse') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 1636742693 │
 └────────────┘
@@ -723,7 +761,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleSimHash(string[, shinglesize])
 ```
 
@@ -742,13 +780,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleSimHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2328277067 │
 └────────────┘
@@ -762,7 +800,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleSimHashCaseInsensitive(string[, shinglesize])
 ```
 
@@ -781,13 +819,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleSimHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2194812424 │
 └────────────┘
@@ -801,7 +839,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleSimHashUTF8(string[, shinglesize])
 ```
 
@@ -820,13 +858,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleSimHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2328277067 │
 └────────────┘
@@ -840,7 +878,7 @@ Can be used for detection of semi-duplicate strings with [bitHammingDistance](..
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleSimHashCaseInsensitiveUTF8(string[, shinglesize])
 ```
 
@@ -859,13 +897,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleSimHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Result:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2194812424 │
 └────────────┘
@@ -879,7 +917,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHash(string[, ngramsize, hashnum])
 ```
 
@@ -899,13 +937,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHash('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (18333312859352735453,9054248444481805918) │
 └────────────────────────────────────────────┘
@@ -919,7 +957,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashCaseInsensitive(string[, ngramsize, hashnum])
 ```
 
@@ -939,13 +977,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashCaseInsensitive('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (2106263556442004574,13203602793651726206) │
 └────────────────────────────────────────────┘
@@ -959,7 +997,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashUTF8(string[, ngramsize, hashnum])
 ```
 
@@ -979,13 +1017,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashUTF8('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (18333312859352735453,6742163577938632877) │
 └────────────────────────────────────────────┘
@@ -999,7 +1037,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashCaseInsensitiveUTF8(string [, ngramsize, hashnum])
 ```
 
@@ -1019,13 +1057,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashCaseInsensitiveUTF8('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple───────────────────────────────────────┐
 │ (12493625717655877135,13203602793651726206) │
 └─────────────────────────────────────────────┘
@@ -1037,7 +1075,7 @@ Splits a ASCII string into n-grams of `ngramsize` symbols and returns the n-gram
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashArg(string[, ngramsize, hashnum])
 ```
 
@@ -1057,13 +1095,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashArg('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ous','ick','lic','Hou','kHo','use'),('Hou','lic','ick','ous','ckH','Cli')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1075,7 +1113,7 @@ Splits a ASCII string into n-grams of `ngramsize` symbols and returns the n-gram
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashArgCaseInsensitive(string[, ngramsize, hashnum])
 ```
 
@@ -1095,13 +1133,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashArgCaseInsensitive('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ous','ick','lic','kHo','use','Cli'),('kHo','lic','ick','ous','ckH','Hou')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1113,7 +1151,7 @@ Splits a UTF-8 string into n-grams of `ngramsize` symbols and returns the n-gram
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashArgUTF8(string[, ngramsize, hashnum])
 ```
 
@@ -1133,13 +1171,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashArgUTF8('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ous','ick','lic','Hou','kHo','use'),('kHo','Hou','lic','ick','ous','ckH')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1151,7 +1189,7 @@ Splits a UTF-8 string into n-grams of `ngramsize` symbols and returns the n-gram
 
 **Syntax**
 
-``` sql
+```sql
 ngramMinHashArgCaseInsensitiveUTF8(string[, ngramsize, hashnum])
 ```
 
@@ -1171,13 +1209,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT ngramMinHashArgCaseInsensitiveUTF8('ClickHouse') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ckH','ous','ick','lic','kHo','use'),('kHo','lic','ick','ous','ckH','Hou')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1191,7 +1229,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHash(string[, shinglesize, hashnum])
 ```
 
@@ -1211,13 +1249,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (16452112859864147620,5844417301642981317) │
 └────────────────────────────────────────────┘
@@ -1231,7 +1269,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashCaseInsensitive(string[, shinglesize, hashnum])
 ```
 
@@ -1251,13 +1289,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────┐
 │ (3065874883688416519,1634050779997673240) │
 └───────────────────────────────────────────┘
@@ -1271,7 +1309,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1291,13 +1329,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (16452112859864147620,5844417301642981317) │
 └────────────────────────────────────────────┘
@@ -1311,7 +1349,7 @@ Can be used for detection of semi-duplicate strings with [tupleHammingDistance](
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1331,13 +1369,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([UInt64](../../sql-refere
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────┐
 │ (3065874883688416519,1634050779997673240) │
 └───────────────────────────────────────────┘
@@ -1349,7 +1387,7 @@ Splits a ASCII string into parts (shingles) of `shinglesize` words each and retu
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashArg(string[, shinglesize, hashnum])
 ```
 
@@ -1369,13 +1407,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArg('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────┐
 │ (('OLAP','database','analytical'),('online','oriented','processing')) │
 └───────────────────────────────────────────────────────────────────────┘
@@ -1387,7 +1425,7 @@ Splits a ASCII string into parts (shingles) of `shinglesize` words each and retu
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashArgCaseInsensitive(string[, shinglesize, hashnum])
 ```
 
@@ -1407,13 +1445,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArgCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────────────────────────────────┐
 │ (('queries','database','analytical'),('oriented','processing','DBMS')) │
 └────────────────────────────────────────────────────────────────────────┘
@@ -1425,7 +1463,7 @@ Splits a UTF-8 string into parts (shingles) of `shinglesize` words each and retu
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashArgUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1445,13 +1483,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArgUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────┐
 │ (('OLAP','database','analytical'),('online','oriented','processing')) │
 └───────────────────────────────────────────────────────────────────────┘
@@ -1463,7 +1501,7 @@ Splits a UTF-8 string into parts (shingles) of `shinglesize` words each and retu
 
 **Syntax**
 
-``` sql
+```sql
 wordShingleMinHashArgCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1483,13 +1521,13 @@ Type: [Tuple](../../sql-reference/data-types/tuple.md)([Tuple](../../sql-referen
 
 Query:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArgCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Result:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────────────────────────────────┐
 │ (('queries','database','analytical'),('oriented','processing','DBMS')) │
 └────────────────────────────────────────────────────────────────────────┘
diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index fa52d32729f..a37398786af 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -478,3 +478,17 @@ Result:
 │                                            0 │
 └──────────────────────────────────────────────┘
 ```
+
+Query:
+
+``` sql
+SELECT isIPAddressInRange('::ffff:192.168.0.1', '::ffff:192.168.0.4/128');
+```
+
+Result:
+
+``` text
+┌─isIPAddressInRange('::ffff:192.168.0.1', '::ffff:192.168.0.4/128')─┐
+│                                                                  0 │
+└────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/window-functions/index.md b/docs/en/sql-reference/window-functions/index.md
index e9a15995a16..e53ea41d606 100644
--- a/docs/en/sql-reference/window-functions/index.md
+++ b/docs/en/sql-reference/window-functions/index.md
@@ -11,7 +11,7 @@ ClickHouse supports the standard grammar for defining windows and window functio
 | --------| ----------|
 | ad hoc window specification (`count(*) over (partition by id order by time desc)`) | supported |
 | expressions involving window functions, e.g. `(count(*) over ()) / 2)` | not supported, wrap in a subquery ([feature request](https://github.com/ClickHouse/ClickHouse/issues/19857)) |
-| `WINDOW` clause (`select ... from table window w as (partiton by id)`) | supported |
+| `WINDOW` clause (`select ... from table window w as (partition by id)`) | supported |
 | `ROWS` frame | supported |
 | `RANGE` frame | supported, the default |
 | `INTERVAL` syntax for `DateTime` `RANGE OFFSET` frame | not supported, specify the number of seconds instead |
diff --git a/docs/ru/sql-reference/data-types/int-uint.md b/docs/ru/sql-reference/data-types/int-uint.md
index 9e6e3a7fd96..06d6727afa4 100644
--- a/docs/ru/sql-reference/data-types/int-uint.md
+++ b/docs/ru/sql-reference/data-types/int-uint.md
@@ -31,7 +31,5 @@ sidebar_label: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64
 -   `UInt16` — \[0 : 65535\]
 -   `UInt32` — \[0 : 4294967295\]
 -   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt128` — \[0 : 340282366920938463463374607431768211455\]
 -   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
-
-`UInt128` пока не реализован.
-
diff --git a/docs/ru/sql-reference/functions/hash-functions.md b/docs/ru/sql-reference/functions/hash-functions.md
index 12091fcbc3f..0065275519b 100644
--- a/docs/ru/sql-reference/functions/hash-functions.md
+++ b/docs/ru/sql-reference/functions/hash-functions.md
@@ -13,7 +13,7 @@ Simhash – это хеш-функция, которая для близких 
 
 [Интерпретирует](../../sql-reference/functions/hash-functions.md#type_conversion_functions-reinterpretAsString) все входные параметры как строки и вычисляет хэш [MD5](https://ru.wikipedia.org/wiki/MD5) для каждой из них. Затем объединяет хэши, берет первые 8 байт хэша результирующей строки и интерпретирует их как значение типа `UInt64` с big-endian порядком байтов.
 
-``` sql
+```sql
 halfMD5(par1, ...)
 ```
 
@@ -30,11 +30,11 @@ halfMD5(par1, ...)
 
 **Пример**
 
-``` sql
+```sql
 SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS halfMD5hash, toTypeName(halfMD5hash) AS type;
 ```
 
-``` text
+```response
 ┌────────halfMD5hash─┬─type───┐
 │ 186182704141653334 │ UInt64 │
 └────────────────────┴────────┘
@@ -54,7 +54,7 @@ SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')
 
 Генерирует 64-х битное значение [SipHash](https://131002.net/siphash/).
 
-``` sql
+```sql
 sipHash64(par1,...)
 ```
 
@@ -77,11 +77,11 @@ sipHash64(par1,...)
 
 **Пример**
 
-``` sql
+```sql
 SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS SipHash, toTypeName(SipHash) AS type;
 ```
 
-``` text
+```response
 ┌──────────────SipHash─┬─type───┐
 │ 13726873534472839665 │ UInt64 │
 └──────────────────────┴────────┘
@@ -93,7 +93,7 @@ SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00
 
 **Синтаксис**
 
-``` sql
+```sql
 sipHash128(par1,...)
 ```
 
@@ -111,13 +111,13 @@ sipHash128(par1,...)
 
 Запрос:
 
-``` sql
+```sql
 SELECT hex(sipHash128('foo', '\x01', 3));
 ```
 
 Результат:
 
-``` text
+```response
 ┌─hex(sipHash128('foo', '', 3))────┐
 │ 9DE516A64A414D4B1B609415E4523F24 │
 └──────────────────────────────────┘
@@ -127,7 +127,7 @@ SELECT hex(sipHash128('foo', '\x01', 3));
 
 Генерирует 64-х битное значение [CityHash](https://github.com/google/cityhash).
 
-``` sql
+```sql
 cityHash64(par1,...)
 ```
 
@@ -145,11 +145,11 @@ cityHash64(par1,...)
 
 Пример вызова:
 
-``` sql
+```sql
 SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS CityHash, toTypeName(CityHash) AS type;
 ```
 
-``` text
+```response
 ┌─────────────CityHash─┬─type───┐
 │ 12072650598913549138 │ UInt64 │
 └──────────────────────┴────────┘
@@ -157,7 +157,7 @@ SELECT cityHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:0
 
 А вот так вы можете вычислить чексумму всей таблицы с точностью до порядка строк:
 
-``` sql
+```sql
 SELECT groupBitXor(cityHash64(*)) FROM table
 ```
 
@@ -177,7 +177,7 @@ SELECT groupBitXor(cityHash64(*)) FROM table
 
 **Синтаксис**
 
-``` sql
+```sql
 SHA1('s')
 ...
 SHA512('s')
@@ -203,18 +203,56 @@ SHA512('s')
 
 Запрос:
 
-``` sql
+```sql
 SELECT hex(SHA1('abc'));
 ```
 
 Результат:
 
-``` text
+```response
 ┌─hex(SHA1('abc'))─────────────────────────┐
 │ A9993E364706816ABA3E25717850C26C9CD0D89D │
 └──────────────────────────────────────────┘
 ```
 
+## BLAKE3 {#blake3}
+
+Вычисляет BLAKE3 хеш строки и возвращает полученный набор байт в виде [FixedString](../data-types/fixedstring.md).
+
+**Синтаксис**
+
+```sql
+BLAKE3('s')
+```
+
+Данная криптографическая функция интегрирована в ClickHouse из Rust-библиотеки. Функция работает сравнительно быстро, показывая в 2 раза более быстрые результаты по сравнению с SHA-2, генерируя хеши аналогичной SHA-256 длины.
+
+**Параметры**
+
+- s - входная строка для вычисления хеша BLAKE3. [String](../data-types/string.md).
+
+**Возвращаемое значение**
+
+- Хеш BLAKE3 в виде шестнадцатеричной строки, имеющей тип FixedString(32).
+
+Тип: [FixedString](../data-types/fixedstring.md).
+
+**Пример**
+
+Используйте функцию [hex](../functions/encoding-functions.md#hex) для представления результата в виде строки с шестнадцатеричной кодировкой.
+
+Запрос:
+```sql
+SELECT hex(BLAKE3('ABC'))
+```
+
+Результат:
+```response
+┌─hex(BLAKE3('ABC'))───────────────────────────────────────────────┐
+│ D1717274597CF0289694F75D96D444B992A096F1AFD8E7BBFA6EBB1D360FEDFC │
+└──────────────────────────────────────────────────────────────────┘
+```
+
 ## URLHash(url\[, N\]) {#urlhashurl-n}
 
 Быстрая не криптографическая хэш-функция неплохого качества для строки, полученной из URL путём некоторой нормализации.
@@ -228,7 +266,7 @@ SELECT hex(SHA1('abc'));
 
 Создает 64-битное значение [FarmHash](https://github.com/google/farmhash), независимое от платформы (архитектуры сервера), что важно, если значения сохраняются или используются для разбиения данных на группы.
 
-``` sql
+```sql
 farmFingerprint64(par1, ...)
 farmHash64(par1, ...)
 ```
@@ -245,11 +283,11 @@ farmHash64(par1, ...)
 
 **Пример**
 
-``` sql
+```sql
 SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS FarmHash, toTypeName(FarmHash) AS type;
 ```
 
-``` text
+```response
 ┌─────────────FarmHash─┬─type───┐
 │ 17790458267262532859 │ UInt64 │
 └──────────────────────┴────────┘
@@ -259,7 +297,7 @@ SELECT farmHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:0
 
 Вычисляет [JavaHash](http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452) от строки. `JavaHash` не отличается ни скоростью, ни качеством, поэтому эту функцию следует считать устаревшей. Используйте эту функцию, если вам необходимо получить значение хэша по такому же алгоритму.
 
-``` sql
+```sql
 SELECT javaHash('')
 ```
 
@@ -273,13 +311,13 @@ SELECT javaHash('')
 
 Запрос:
 
-``` sql
+```sql
 SELECT javaHash('Hello, world!');
 ```
 
 Результат:
 
-``` text
+```response
 ┌─javaHash('Hello, world!')─┐
 │               -1880044555 │
 └───────────────────────────┘
@@ -291,7 +329,7 @@ SELECT javaHash('Hello, world!');
 
 **Синтаксис**
 
-``` sql
+```sql
 javaHashUTF16LE(stringUtf16le)
 ```
 
@@ -311,13 +349,13 @@ javaHashUTF16LE(stringUtf16le)
 
 Запрос:
 
-``` sql
+```sql
 SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'));
 ```
 
 Результат:
 
-``` text
+```response
 ┌─javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'))─┐
 │                                                      3556498 │
 └──────────────────────────────────────────────────────────────┘
@@ -327,7 +365,7 @@ SELECT javaHashUTF16LE(convertCharset('test', 'utf-8', 'utf-16le'));
 
 Вычисляет `HiveHash` от строки.
 
-``` sql
+```sql
 SELECT hiveHash('')
 ```
 
@@ -343,13 +381,13 @@ SELECT hiveHash('')
 
 Запрос:
 
-``` sql
+```sql
 SELECT hiveHash('Hello, world!');
 ```
 
 Результат:
 
-``` text
+```response
 ┌─hiveHash('Hello, world!')─┐
 │                 267439093 │
 └───────────────────────────┘
@@ -359,7 +397,7 @@ SELECT hiveHash('Hello, world!');
 
 Генерирует 64-х битное значение [MetroHash](http://www.jandrewrogers.com/2015/05/27/metrohash/).
 
-``` sql
+```sql
 metroHash64(par1, ...)
 ```
 
@@ -373,11 +411,11 @@ metroHash64(par1, ...)
 
 **Пример**
 
-``` sql
+```sql
 SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MetroHash, toTypeName(MetroHash) AS type;
 ```
 
-``` text
+```response
 ┌────────────MetroHash─┬─type───┐
 │ 14235658766382344533 │ UInt64 │
 └──────────────────────┴────────┘
@@ -393,7 +431,7 @@ SELECT metroHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:
 
 Генерирует значение [MurmurHash2](https://github.com/aappleby/smhasher).
 
-``` sql
+```sql
 murmurHash2_32(par1, ...)
 murmurHash2_64(par1, ...)
 ```
@@ -409,11 +447,11 @@ murmurHash2_64(par1, ...)
 
 **Пример**
 
-``` sql
+```sql
 SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash2, toTypeName(MurmurHash2) AS type;
 ```
 
-``` text
+```response
 ┌──────────MurmurHash2─┬─type───┐
 │ 11832096901709403633 │ UInt64 │
 └──────────────────────┴────────┘
@@ -425,7 +463,7 @@ SELECT murmurHash2_64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:
 
 **Синтаксис**
 
-``` sql
+```sql
 gccMurmurHash(par1, ...);
 ```
 
@@ -443,7 +481,7 @@ gccMurmurHash(par1, ...);
 
 Запрос:
 
-``` sql
+```sql
 SELECT
     gccMurmurHash(1, 2, 3) AS res1,
     gccMurmurHash(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2)))) AS res2
@@ -451,7 +489,7 @@ SELECT
 
 Результат:
 
-``` text
+```response
 ┌─────────────────res1─┬────────────────res2─┐
 │ 12384823029245979431 │ 1188926775431157506 │
 └──────────────────────┴─────────────────────┘
@@ -461,7 +499,7 @@ SELECT
 
 Генерирует значение [MurmurHash3](https://github.com/aappleby/smhasher).
 
-``` sql
+```sql
 murmurHash3_32(par1, ...)
 murmurHash3_64(par1, ...)
 ```
@@ -477,11 +515,11 @@ murmurHash3_64(par1, ...)
 
 **Пример**
 
-``` sql
+```sql
 SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
-``` text
+```response
 ┌─MurmurHash3─┬─type───┐
 │     2152717 │ UInt32 │
 └─────────────┴────────┘
@@ -493,7 +531,7 @@ SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:
 
 **Синтаксис**
 
-``` sql
+```sql
 murmurHash3_128(expr)
 ```
 
@@ -511,13 +549,13 @@ murmurHash3_128(expr)
 
 Запрос:
 
-``` sql
+```sql
 SELECT hex(murmurHash3_128('foo', 'foo', 'foo'));
 ```
 
 Результат:
 
-``` text
+```response
 ┌─hex(murmurHash3_128('foo', 'foo', 'foo'))─┐
 │ F8F7AD9B6CD4CF117A71E277E2EC2931          │
 └───────────────────────────────────────────┘
@@ -527,7 +565,7 @@ SELECT hex(murmurHash3_128('foo', 'foo', 'foo'));
 
 Вычисляет `xxHash` от строки. Предлагается в двух вариантах: 32 и 64 бита.
 
-``` sql
+```sql
 SELECT xxHash32('')
 
 OR
@@ -545,13 +583,13 @@ SELECT xxHash64('')
 
 Запрос:
 
-``` sql
+```sql
 SELECT xxHash32('Hello, world!');
 ```
 
 Результат:
 
-``` text
+```response
 ┌─xxHash32('Hello, world!')─┐
 │                 834093149 │
 └───────────────────────────┘
@@ -569,7 +607,7 @@ SELECT xxHash32('Hello, world!');
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramSimHash(string[, ngramsize])
 ```
 
@@ -588,13 +626,13 @@ ngramSimHash(string[, ngramsize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramSimHash('ClickHouse') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 1627567969 │
 └────────────┘
@@ -608,7 +646,7 @@ SELECT ngramSimHash('ClickHouse') AS Hash;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramSimHashCaseInsensitive(string[, ngramsize])
 ```
 
@@ -627,13 +665,13 @@ ngramSimHashCaseInsensitive(string[, ngramsize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramSimHashCaseInsensitive('ClickHouse') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌──────Hash─┐
 │ 562180645 │
 └───────────┘
@@ -647,7 +685,7 @@ SELECT ngramSimHashCaseInsensitive('ClickHouse') AS Hash;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramSimHashUTF8(string[, ngramsize])
 ```
 
@@ -666,13 +704,13 @@ ngramSimHashUTF8(string[, ngramsize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramSimHashUTF8('ClickHouse') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 1628157797 │
 └────────────┘
@@ -686,7 +724,7 @@ SELECT ngramSimHashUTF8('ClickHouse') AS Hash;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramSimHashCaseInsensitiveUTF8(string[, ngramsize])
 ```
 
@@ -705,13 +743,13 @@ ngramSimHashCaseInsensitiveUTF8(string[, ngramsize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramSimHashCaseInsensitiveUTF8('ClickHouse') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 1636742693 │
 └────────────┘
@@ -725,7 +763,7 @@ SELECT ngramSimHashCaseInsensitiveUTF8('ClickHouse') AS Hash;
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleSimHash(string[, shinglesize])
 ```
 
@@ -744,13 +782,13 @@ wordShingleSimHash(string[, shinglesize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleSimHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2328277067 │
 └────────────┘
@@ -764,7 +802,7 @@ SELECT wordShingleSimHash('ClickHouse® is a column-oriented database management
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleSimHashCaseInsensitive(string[, shinglesize])
 ```
 
@@ -783,13 +821,13 @@ wordShingleSimHashCaseInsensitive(string[, shinglesize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleSimHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2194812424 │
 └────────────┘
@@ -803,7 +841,7 @@ SELECT wordShingleSimHashCaseInsensitive('ClickHouse® is a column-oriented data
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleSimHashUTF8(string[, shinglesize])
 ```
 
@@ -822,13 +860,13 @@ wordShingleSimHashUTF8(string[, shinglesize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleSimHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2328277067 │
 └────────────┘
@@ -842,7 +880,7 @@ SELECT wordShingleSimHashUTF8('ClickHouse® is a column-oriented database manage
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleSimHashCaseInsensitiveUTF8(string[, shinglesize])
 ```
 
@@ -861,13 +899,13 @@ wordShingleSimHashCaseInsensitiveUTF8(string[, shinglesize])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleSimHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Hash;
 ```
 
 Результат:
 
-``` text
+```response
 ┌───────Hash─┐
 │ 2194812424 │
 └────────────┘
@@ -881,7 +919,7 @@ SELECT wordShingleSimHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHash(string[, ngramsize, hashnum])
 ```
 
@@ -901,13 +939,13 @@ ngramMinHash(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHash('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (18333312859352735453,9054248444481805918) │
 └────────────────────────────────────────────┘
@@ -921,7 +959,7 @@ SELECT ngramMinHash('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHashCaseInsensitive(string[, ngramsize, hashnum])
 ```
 
@@ -941,13 +979,13 @@ ngramMinHashCaseInsensitive(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashCaseInsensitive('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (2106263556442004574,13203602793651726206) │
 └────────────────────────────────────────────┘
@@ -960,7 +998,7 @@ SELECT ngramMinHashCaseInsensitive('ClickHouse') AS Tuple;
 Может быть использована для проверки двух строк на схожесть вместе с функцией [tupleHammingDistance](../../sql-reference/functions/tuple-functions.md#tuplehammingdistance). Если для двух строк минимальные или максимальные хеши одинаковы, мы считаем, что эти строки совпадают.
 
 **Синтаксис**
-``` sql
+```sql
 ngramMinHashUTF8(string[, ngramsize, hashnum])
 ```
 
@@ -980,13 +1018,13 @@ ngramMinHashUTF8(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashUTF8('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (18333312859352735453,6742163577938632877) │
 └────────────────────────────────────────────┘
@@ -1000,7 +1038,7 @@ SELECT ngramMinHashUTF8('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHashCaseInsensitiveUTF8(string [, ngramsize, hashnum])
 ```
 
@@ -1020,13 +1058,13 @@ ngramMinHashCaseInsensitiveUTF8(string [, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashCaseInsensitiveUTF8('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple───────────────────────────────────────┐
 │ (12493625717655877135,13203602793651726206) │
 └─────────────────────────────────────────────┘
@@ -1038,7 +1076,7 @@ SELECT ngramMinHashCaseInsensitiveUTF8('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHashArg(string[, ngramsize, hashnum])
 ```
 
@@ -1058,13 +1096,13 @@ ngramMinHashArg(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashArg('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ous','ick','lic','Hou','kHo','use'),('Hou','lic','ick','ous','ckH','Cli')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1076,7 +1114,7 @@ SELECT ngramMinHashArg('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHashArgCaseInsensitive(string[, ngramsize, hashnum])
 ```
 
@@ -1096,13 +1134,13 @@ ngramMinHashArgCaseInsensitive(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashArgCaseInsensitive('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ous','ick','lic','kHo','use','Cli'),('kHo','lic','ick','ous','ckH','Hou')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1114,7 +1152,7 @@ SELECT ngramMinHashArgCaseInsensitive('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHashArgUTF8(string[, ngramsize, hashnum])
 ```
 
@@ -1134,13 +1172,13 @@ ngramMinHashArgUTF8(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashArgUTF8('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ous','ick','lic','Hou','kHo','use'),('kHo','Hou','lic','ick','ous','ckH')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1152,7 +1190,7 @@ SELECT ngramMinHashArgUTF8('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 ngramMinHashArgCaseInsensitiveUTF8(string[, ngramsize, hashnum])
 ```
 
@@ -1172,13 +1210,13 @@ ngramMinHashArgCaseInsensitiveUTF8(string[, ngramsize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT ngramMinHashArgCaseInsensitiveUTF8('ClickHouse') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────────────┐
 │ (('ckH','ous','ick','lic','kHo','use'),('kHo','lic','ick','ous','ckH','Hou')) │
 └───────────────────────────────────────────────────────────────────────────────┘
@@ -1192,7 +1230,7 @@ SELECT ngramMinHashArgCaseInsensitiveUTF8('ClickHouse') AS Tuple;
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHash(string[, shinglesize, hashnum])
 ```
 
@@ -1212,13 +1250,13 @@ wordShingleMinHash(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHash('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (16452112859864147620,5844417301642981317) │
 └────────────────────────────────────────────┘
@@ -1232,7 +1270,7 @@ SELECT wordShingleMinHash('ClickHouse® is a column-oriented database management
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashCaseInsensitive(string[, shinglesize, hashnum])
 ```
 
@@ -1252,13 +1290,13 @@ wordShingleMinHashCaseInsensitive(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────┐
 │ (3065874883688416519,1634050779997673240) │
 └───────────────────────────────────────────┘
@@ -1272,7 +1310,7 @@ SELECT wordShingleMinHashCaseInsensitive('ClickHouse® is a column-oriented data
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1292,13 +1330,13 @@ wordShingleMinHashUTF8(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────┐
 │ (16452112859864147620,5844417301642981317) │
 └────────────────────────────────────────────┘
@@ -1312,7 +1350,7 @@ SELECT wordShingleMinHashUTF8('ClickHouse® is a column-oriented database manage
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1332,13 +1370,13 @@ wordShingleMinHashCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).') AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────┐
 │ (3065874883688416519,1634050779997673240) │
 └───────────────────────────────────────────┘
@@ -1350,7 +1388,7 @@ SELECT wordShingleMinHashCaseInsensitiveUTF8('ClickHouse® is a column-oriented
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashArg(string[, shinglesize, hashnum])
 ```
 
@@ -1370,13 +1408,13 @@ wordShingleMinHashArg(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArg('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────┐
 │ (('OLAP','database','analytical'),('online','oriented','processing')) │
 └───────────────────────────────────────────────────────────────────────┘
@@ -1388,7 +1426,7 @@ SELECT wordShingleMinHashArg('ClickHouse® is a column-oriented database managem
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashArgCaseInsensitive(string[, shinglesize, hashnum])
 ```
 
@@ -1408,13 +1446,13 @@ wordShingleMinHashArgCaseInsensitive(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArgCaseInsensitive('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────────────────────────────────┐
 │ (('queries','database','analytical'),('oriented','processing','DBMS')) │
 └────────────────────────────────────────────────────────────────────────┘
@@ -1426,7 +1464,7 @@ SELECT wordShingleMinHashArgCaseInsensitive('ClickHouse® is a column-oriented d
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashArgUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1446,13 +1484,13 @@ wordShingleMinHashArgUTF8(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArgUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple─────────────────────────────────────────────────────────────────┐
 │ (('OLAP','database','analytical'),('online','oriented','processing')) │
 └───────────────────────────────────────────────────────────────────────┘
@@ -1464,7 +1502,7 @@ SELECT wordShingleMinHashArgUTF8('ClickHouse® is a column-oriented database man
 
 **Синтаксис**
 
-``` sql
+```sql
 wordShingleMinHashArgCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 ```
 
@@ -1484,13 +1522,13 @@ wordShingleMinHashArgCaseInsensitiveUTF8(string[, shinglesize, hashnum])
 
 Запрос:
 
-``` sql
+```sql
 SELECT wordShingleMinHashArgCaseInsensitiveUTF8('ClickHouse® is a column-oriented database management system (DBMS) for online analytical processing of queries (OLAP).', 1, 3) AS Tuple;
 ```
 
 Результат:
 
-``` text
+```response
 ┌─Tuple──────────────────────────────────────────────────────────────────┐
 │ (('queries','database','analytical'),('oriented','processing','DBMS')) │
 └────────────────────────────────────────────────────────────────────────┘
diff --git a/docs/ru/sql-reference/functions/ip-address-functions.md b/docs/ru/sql-reference/functions/ip-address-functions.md
index f18ea08b633..428fd3dff31 100644
--- a/docs/ru/sql-reference/functions/ip-address-functions.md
+++ b/docs/ru/sql-reference/functions/ip-address-functions.md
@@ -446,3 +446,17 @@ SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16');
 │                                            0 │
 └──────────────────────────────────────────────┘
 ```
+
+Запрос:
+
+``` sql
+SELECT isIPAddressInRange('::ffff:192.168.0.1', '::ffff:192.168.0.4/128');
+```
+
+Результат:
+
+``` text
+┌─isIPAddressInRange('::ffff:192.168.0.1', '::ffff:192.168.0.4/128')─┐
+│                                                                  0 │
+└────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/tools/build.py b/docs/tools/build.py
index b0d62e68b7f..f084a8e5c0c 100755
--- a/docs/tools/build.py
+++ b/docs/tools/build.py
@@ -157,6 +157,7 @@ def build(args):
 
     if not args.skip_website:
         website.process_benchmark_results(args)
+        website.minify_website(args)
         redirects.build_static_redirects(args)
 
 
diff --git a/docs/tools/website.py b/docs/tools/website.py
index 21fd636e1cb..f73da9bd3c4 100644
--- a/docs/tools/website.py
+++ b/docs/tools/website.py
@@ -1,7 +1,10 @@
+import hashlib
 import json
 import logging
 import os
 import shutil
+import subprocess
+
 import bs4
 
 import util
@@ -178,6 +181,59 @@ def build_website(args):
                 f.write(content.encode("utf-8"))
 
 
+def get_css_in(args):
+    return [
+        f"'{args.website_dir}/css/bootstrap.css'",
+        f"'{args.website_dir}/css/docsearch.css'",
+        f"'{args.website_dir}/css/base.css'",
+        f"'{args.website_dir}/css/blog.css'",
+        f"'{args.website_dir}/css/docs.css'",
+        f"'{args.website_dir}/css/highlight.css'",
+        f"'{args.website_dir}/css/main.css'",
+    ]
+
+
+def get_js_in(args):
+    return [
+        f"'{args.website_dir}/js/jquery.js'",
+        f"'{args.website_dir}/js/popper.js'",
+        f"'{args.website_dir}/js/bootstrap.js'",
+        f"'{args.website_dir}/js/sentry.js'",
+        f"'{args.website_dir}/js/base.js'",
+        f"'{args.website_dir}/js/index.js'",
+        f"'{args.website_dir}/js/docsearch.js'",
+        f"'{args.website_dir}/js/docs.js'",
+        f"'{args.website_dir}/js/main.js'",
+    ]
+
+
+def minify_website(args):
+    css_in = " ".join(get_css_in(args))
+    css_out = f"{args.output_dir}/docs/css/base.css"
+    os.makedirs(f"{args.output_dir}/docs/css")
+
+    command = f"cat {css_in}"
+    output = subprocess.check_output(command, shell=True)
+    with open(css_out, "wb+") as f:
+        f.write(output)
+
+    with open(css_out, "rb") as f:
+        css_digest = hashlib.sha3_224(f.read()).hexdigest()[0:8]
+
+    js_in = " ".join(get_js_in(args))
+    js_out = f"{args.output_dir}/docs/js/base.js"
+    os.makedirs(f"{args.output_dir}/docs/js")
+
+    command = f"cat {js_in}"
+    output = subprocess.check_output(command, shell=True)
+    with open(js_out, "wb+") as f:
+        f.write(output)
+
+    with open(js_out, "rb") as f:
+        js_digest = hashlib.sha3_224(f.read()).hexdigest()[0:8]
+        logging.info(js_digest)
+
+
 def process_benchmark_results(args):
     benchmark_root = os.path.join(args.website_dir, "benchmark")
     required_keys = {
diff --git a/docs/zh/sql-reference/functions/arithmetic-functions.md b/docs/zh/sql-reference/functions/arithmetic-functions.md
index 7af0df084f3..15bec0d2107 100644
--- a/docs/zh/sql-reference/functions/arithmetic-functions.md
+++ b/docs/zh/sql-reference/functions/arithmetic-functions.md
@@ -80,4 +80,78 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 返回数值的最小公倍数。
 除以零或将最小负数除以-1时抛出异常。
 
+## max2 {#max2}
+
+比较两个值并返回最大值。返回值转换为[Float64](../../sql-reference/data-types/float.md)。
+
+**语法**
+
+```sql
+max2(value1, value2)
+```
+
+**参数**
+
+-   `value1` — 第一个值，类型为[Int/UInt](../../sql-reference/data-types/int-uint.md)或[Float](../../sql-reference/data-types/float.md)。
+-   `value2` — 第二个值，类型为[Int/UInt](../../sql-reference/data-types/int-uint.md)或[Float](../../sql-reference/data-types/float.md)。
+
+**返回值**
+
+-   两个值中的最大值。
+
+类型: [Float](../../sql-reference/data-types/float.md)。
+
+**示例**
+
+查询语句:
+
+```sql
+SELECT max2(-1, 2);
+```
+
+结果:
+
+```text
+┌─max2(-1, 2)─┐
+│           2 │
+└─────────────┘
+```
+
+## min2 {#min2}
+
+比较两个值并返回最小值。返回值类型转换为[Float64](../../sql-reference/data-types/float.md)。
+
+**语法**
+
+```sql
+max2(value1, value2)
+```
+
+**参数**
+
+-   `value1` — 第一个值，类型为[Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md)。
+-   `value2` — 第二个值，类型为[Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md)。
+
+**返回值**
+
+-   两个值中的最小值。
+
+类型: [Float](../../sql-reference/data-types/float.md)。
+
+**示例**
+
+查询语句:
+
+```sql
+SELECT min2(-1, 2);
+```
+
+结果:
+
+```text
+┌─min2(-1, 2)─┐
+│          -1 │
+└─────────────┘
+```
+
 [来源文章](https://clickhouse.com/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/array-functions.md b/docs/zh/sql-reference/functions/array-functions.md
index 6ec6d8fe352..0d4f51e1ddc 100644
--- a/docs/zh/sql-reference/functions/array-functions.md
+++ b/docs/zh/sql-reference/functions/array-functions.md
@@ -1,16 +1,92 @@
 # 数组函数 {#shu-zu-han-shu}
 
-## empty {#empty}
+## empty {#empty函数}
 
-对于空数组返回1，对于非空数组返回0。
-结果类型是UInt8。
-该函数也适用于字符串。
+检查输入的数组是否为空。
 
-## notEmpty {#notempty}
+**语法**
 
-对于空数组返回0，对于非空数组返回1。
-结果类型是UInt8。
-该函数也适用于字符串。
+``` sql
+empty([x])
+```
+
+如果一个数组中不包含任何元素，则此数组为空数组。
+
+:::注意    
+可以通过启用[optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns)配置进行优化。设置`optimize_functions_to_subcolumns = 1`后，函数通过读取[size0](../../sql-reference/data-types/array.md#array-size)子列获取结果，不在读取和处理整个数组列，查询语句`SELECT empty(arr) FROM TABLE;`将转化为`SELECT arr.size0 = 0 FROM TABLE;`。
+:::
+
+此函数也适用于[strings](string-functions.md#empty)或[UUID](uuid-functions.md#empty)。
+
+**参数**
+
+-   `[x]` — 输入的数组，类型为[数组](../data-types/array.md)。
+
+**返回值**
+
+-   对于空数组返回`1`，对于非空数组返回`0`。
+
+类型: [UInt8](../data-types/int-uint.md)。
+
+**示例**
+
+查询语句:
+
+```sql
+SELECT empty([]);
+```
+
+结果:
+
+```text
+┌─empty(array())─┐
+│              1 │
+└────────────────┘
+```
+
+## notEmpty {#notempty函数}
+
+检测输入的数组是否非空。
+
+**语法**
+
+``` sql
+notEmpty([x])
+```
+
+如果一个数组至少包含一个元素，则此数组为非空数组。
+
+:::注意    
+可以通过启用[optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns)配置进行优化。设置`optimize_functions_to_subcolumns = 1`后，函数通过读取[size0](../../sql-reference/data-types/array.md#array-size)子列获取结果，不在读取和处理整个数组列，查询语句`SELECT notEmpty(arr) FROM TABLE;`将转化为`SELECT arr.size0 != 0 FROM TABLE;`。
+:::
+
+此函数也适用于[strings](string-functions.md#empty)或[UUID](uuid-functions.md#empty)。
+
+**参数**
+
+-   `[x]` — 输入的数组，类型为[数组](../data-types/array.md)。
+
+**返回值**
+
+-   对于空数组返回`0`，对于非空数组返回`1`。
+
+类型: [UInt8](../data-types/int-uint.md).
+
+**示例**
+
+查询语句:
+
+```sql
+SELECT notEmpty([1,2]);
+```
+
+结果:
+
+```text
+┌─notEmpty([1, 2])─┐
+│                1 │
+└──────────────────┘
+```
 
 ## length {#array_functions-length}
 
@@ -18,13 +94,15 @@
 结果类型是UInt64。
 该函数也适用于字符串。
 
-## emptyArrayUInt8,emptyArrayUInt16,emptyArrayUInt32,emptyArrayUInt64 {#emptyarrayuint8-emptyarrayuint16-emptyarrayuint32-emptyarrayuint64}
+可以通过启用[optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns)配置进行优化。设置`optimize_functions_to_subcolumns = 1`后，函数通过读取[size0](../../sql-reference/data-types/array.md#array-size)子列获取结果，不在读取和处理整个数组列，查询语句`SELECT length(arr) FROM table`将转化为`SELECT arr.size0 FROM TABLE`。
 
-## emptyArrayInt8,emptyArrayInt16,emptyArrayInt32,emptyArrayInt64 {#emptyarrayint8-emptyarrayint16-emptyarrayint32-emptyarrayint64}
+## emptyArrayUInt8, emptyArrayUInt16, emptyArrayUInt32, emptyArrayUInt64 {#emptyarrayuint8-emptyarrayuint16-emptyarrayuint32-emptyarrayuint64}
 
-## emptyArrayFloat32,emptyArrayFloat64 {#emptyarrayfloat32-emptyarrayfloat64}
+## emptyArrayInt8, emptyArrayInt16, emptyArrayInt32, emptyArrayInt64 {#emptyarrayint8-emptyarrayint16-emptyarrayint32-emptyarrayint64}
 
-## emptyArrayDate，emptyArrayDateTime {#emptyarraydate-emptyarraydatetime}
+## emptyArrayFloat32, emptyArrayFloat64 {#emptyarrayfloat32-emptyarrayfloat64}
+
+## emptyArrayDate, emptyArrayDateTime {#emptyarraydate-emptyarraydatetime}
 
 ## emptyArrayString {#emptyarraystring}
 
@@ -34,10 +112,43 @@
 
 接受一个空数组并返回一个仅包含一个默认值元素的数组。
 
-## range(N) {#rangen}
+## range(end), range(\[start, \] end \[, step\]) {#range}
 
-返回从0到N-1的数字数组。
-以防万一，如果在数据块中创建总长度超过100,000,000个元素的数组，则抛出异常。
+返回一个以`step`作为增量步长的从`start`到`end - 1`的`UInt`类型数字数组。
+
+**语法**
+``` sql
+range([start, ] end [, step])
+```
+
+**参数**
+
+-   `start` — 数组的第一个元素。可选项，如果设置了`step`时同样需要`start`，默认值为：0，类型为[UInt](../data-types/int-uint.md)。
+-   `end` — 计数到`end`结束，但不包括`end`，必填项，类型为[UInt](../data-types/int-uint.md)。
+-   `step` — 确定数组中每个元素之间的增量步长。可选项，默认值为：1，类型为[UInt](../data-types/int-uint.md)。
+
+**返回值**
+
+-   以`step`作为增量步长的从`start`到`end - 1`的`UInt`类型数字数组。
+
+**注意事项**
+
+-   所有参数必须是正值：`start`、`end`、`step`，类型均为`UInt`，结果数组的元素与此相同。
+-   如果查询结果的数组总长度超过[function_range_max_elements_in_block](../../operations/settings/settings.md#settings-function_range_max_elements_in_block)指定的元素数，将会抛出异常。
+
+
+**示例**
+
+查询语句:
+``` sql
+SELECT range(5), range(1, 5), range(1, 5, 2);
+```
+结果:
+```txt
+┌─range(5)────┬─range(1, 5)─┬─range(1, 5, 2)─┐
+│ [0,1,2,3,4] │ [1,2,3,4]   │ [1,3]          │
+└─────────────┴─────────────┴────────────────┘
+```
 
 ## array(x1, …), operator \[x1, …\] {#arrayx1-operator-x1}
 
@@ -49,7 +160,9 @@
 
 合并参数中传递的所有数组。
 
-    arrayConcat(arrays)
+``` sql
+arrayConcat(arrays)
+```
 
 **参数**
 
@@ -62,9 +175,11 @@
 SELECT arrayConcat([1, 2], [3, 4], [5, 6]) AS res
 ```
 
-    ┌─res───────────┐
-    │ [1,2,3,4,5,6] │
-    └───────────────┘
+``` text
+┌─res───────────┐
+│ [1,2,3,4,5,6] │
+└───────────────┘
+```
 
 ## arrayElement(arr,n),运算符arr\[n\] {#arrayelementarr-n-operator-arrn}
 
@@ -156,22 +271,76 @@ SELECT arrayConcat([1, 2], [3, 4], [5, 6]) AS res
 
 `SELECT hasAll([[1, 2], [3, 4]], [[1, 2], [1, 2]])` 返回 `1`.
 
+## hasSubstr {#hassubstr}
+
+检查 array2 的所有元素是否以相同的顺序出现在 array1 中。当且仅当 `array1 = prefix + array2 + suffix`时，该函数将返回 1。
+
+``` sql
+hasSubstr(array1, array2)
+```
+
+换句话说，函数将检查 `array2` 的所有元素是否都包含在 `array1` 中，就像 `hasAll` 函数一样。此外，它将检查元素在“array1”和“array2”中的出现顺序是否相同。
+
+举例:
+- `hasSubstr([1,2,3,4], [2,3])`返回`1`。然而`hasSubstr([1,2,3,4], [3,2])`将返回`0`。
+- `hasSubstr([1,2,3,4], [1,2,3])`返回`1`。然而`hasSubstr([1,2,3,4], [1,2,4])`将返回`0`。
+
+**参数**
+
+-   `array1` – 具有一组元素的任何类型数组。
+-   `array2` – 具有一组元素的任何类型数组。
+
+**返回值**
+
+-   如果`array1`中包含`array2`，返回`1`。
+-   其他情况返回`0`。
+
+**特殊属性**
+
+-   当`array2`为空数组时，函数将返回`1`.
+-   `Null` 作为值处理。换句话说，`hasSubstr([1, 2, NULL, 3, 4], [2,3])` 将返回 `0`。但是，`hasSubstr([1, 2, NULL, 3, 4], [2,NULL,3])` 将返回 `1`。
+-   两个数组中**值的顺序**会影响函数结果。
+
+**示例**
+
+`SELECT hasSubstr([], [])`返回1。
+
+`SELECT hasSubstr([1, Null], [Null])`返回1。
+
+`SELECT hasSubstr([1.0, 2, 3, 4], [1, 3])`返回0。
+
+`SELECT hasSubstr(['a', 'b'], ['a'])`返回1。
+
+`SELECT hasSubstr(['a', 'b' , 'c'], ['a', 'b'])`返回1。
+
+`SELECT hasSubstr(['a', 'b' , 'c'], ['a', 'c'])`返回0。
+
+`SELECT hasSubstr([[1, 2], [3, 4], [5, 6]], [[1, 2], [3, 4]])`返回1。
+
 ## indexOf(arr,x) {#indexofarr-x}
 
 返回数组中第一个’x’元素的索引（从1开始），如果’x’元素不存在在数组中，则返回0。
 
 示例:
 
-    :) SELECT indexOf([1,3,NULL,NULL],NULL)
+``` sql
+SELECT indexOf([1, 3, NULL, NULL], NULL)
+```
 
-    SELECT indexOf([1, 3, NULL, NULL], NULL)
-
-    ┌─indexOf([1, 3, NULL, NULL], NULL)─┐
-    │                                 3 │
-    └───────────────────────────────────┘
+``` text
+┌─indexOf([1, 3, NULL, NULL], NULL)─┐
+│                                 3 │
+└───────────────────────────────────┘
+```
 
 设置为«NULL»的元素将作为普通的元素值处理。
 
+## arrayCount(\[func,\] arr1, …) {#array-count}
+
+`func`将arr数组作为参数，其返回结果为非零值的数量。如果未指定“func”，则返回数组中非零元素的数量。
+
+请注意，`arrayCount`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您可以将 lambda 函数作为第一个参数传递给它。
+
 ## countEqual(arr,x) {#countequalarr-x}
 
 返回数组中等于x的元素的个数。相当于arrayCount（elem - \> elem = x，arr）。
@@ -180,11 +349,15 @@ SELECT arrayConcat([1, 2], [3, 4], [5, 6]) AS res
 
 示例:
 
-    SELECT countEqual([1, 2, NULL, NULL], NULL)
+``` sql
+SELECT countEqual([1, 2, NULL, NULL], NULL)
+```
 
-    ┌─countEqual([1, 2, NULL, NULL], NULL)─┐
-    │                                    2 │
-    └──────────────────────────────────────┘
+``` text
+┌─countEqual([1, 2, NULL, NULL], NULL)─┐
+│                                    2 │
+└──────────────────────────────────────┘
+```
 
 ## arrayEnumerate(arr) {#array_functions-arrayenumerate}
 
@@ -204,9 +377,11 @@ WHERE CounterID = 160656
 LIMIT 10
 ```
 
-    ┌─Reaches─┬──Hits─┐
-    │   95606 │ 31406 │
-    └─────────┴───────┘
+``` text
+┌─Reaches─┬──Hits─┐
+│   95606 │ 31406 │
+└─────────┴───────┘
+```
 
 在此示例中，Reaches是转换次数（应用ARRAY JOIN后接收的字符串），Hits是浏览量（ARRAY JOIN之前的字符串）。在这种特殊情况下，您可以更轻松地获得相同的结果：
 
@@ -218,9 +393,11 @@ FROM test.hits
 WHERE (CounterID = 160656) AND notEmpty(GoalsReached)
 ```
 
-    ┌─Reaches─┬──Hits─┐
-    │   95606 │ 31406 │
-    └─────────┴───────┘
+``` text
+┌─Reaches─┬──Hits─┐
+│   95606 │ 31406 │
+└─────────┴───────┘
+```
 
 此功能也可用于高阶函数。例如，您可以使用它来获取与条件匹配的元素的数组索引。
 
@@ -248,18 +425,20 @@ ORDER BY Reaches DESC
 LIMIT 10
 ```
 
-    ┌──GoalID─┬─Reaches─┬─Visits─┐
-    │   53225 │    3214 │   1097 │
-    │ 2825062 │    3188 │   1097 │
-    │   56600 │    2803 │    488 │
-    │ 1989037 │    2401 │    365 │
-    │ 2830064 │    2396 │    910 │
-    │ 1113562 │    2372 │    373 │
-    │ 3270895 │    2262 │    812 │
-    │ 1084657 │    2262 │    345 │
-    │   56599 │    2260 │    799 │
-    │ 3271094 │    2256 │    812 │
-    └─────────┴─────────┴────────┘
+``` text
+┌──GoalID─┬─Reaches─┬─Visits─┐
+│   53225 │    3214 │   1097 │
+│ 2825062 │    3188 │   1097 │
+│   56600 │    2803 │    488 │
+│ 1989037 │    2401 │    365 │
+│ 2830064 │    2396 │    910 │
+│ 1113562 │    2372 │    373 │
+│ 3270895 │    2262 │    812 │
+│ 1084657 │    2262 │    345 │
+│   56599 │    2260 │    799 │
+│ 3271094 │    2256 │    812 │
+└─────────┴─────────┴────────┘
+```
 
 在此示例中，每个GoalID都计算转换次数（目标嵌套数据结构中的每个元素都是达到的目标，我们称之为转换）和会话数。如果没有ARRAY JOIN，我们会将会话数计为总和（Sign）。但在这种特殊情况下，行乘以嵌套的Goals结构，因此为了在此之后计算每个会话一次，我们将一个条件应用于arrayEnumerateUniq（Goals.ID）函数的值。
 
@@ -269,9 +448,11 @@ arrayEnumerateUniq函数可以使用与参数大小相同的多个数组。在
 SELECT arrayEnumerateUniq([1, 1, 1, 2, 2, 2], [1, 1, 2, 1, 1, 2]) AS res
 ```
 
-    ┌─res───────────┐
-    │ [1,2,1,1,2,1] │
-    └───────────────┘
+``` text
+┌─res───────────┐
+│ [1,2,1,1,2,1] │
+└───────────────┘
+```
 
 当使用带有嵌套数据结构的ARRAY JOIN并在此结构中跨多个元素进一步聚合时，这是必需的。
 
@@ -291,10 +472,11 @@ SELECT arrayEnumerateUniq([1, 1, 1, 2, 2, 2], [1, 1, 2, 1, 1, 2]) AS res
 SELECT arrayPopBack([1, 2, 3]) AS res
 ```
 
-    ┌─res───┐
-    │ [1,2] │
-    └───────┘
-
+``` text
+┌─res───┐
+│ [1,2] │
+└───────┘
+```
 ## arrayPopFront {#arraypopfront}
 
 从数组中删除第一项。
@@ -311,15 +493,19 @@ SELECT arrayPopBack([1, 2, 3]) AS res
 SELECT arrayPopFront([1, 2, 3]) AS res
 ```
 
-    ┌─res───┐
-    │ [2,3] │
-    └───────┘
+``` text
+┌─res───┐
+│ [2,3] │
+└───────┘
+```
 
 ## arrayPushBack {#arraypushback}
 
 添加一个元素到数组的末尾。
 
-    arrayPushBack(array, single_value)
+``` sql
+arrayPushBack(array, single_value)
+```
 
 **参数**
 
@@ -332,15 +518,19 @@ SELECT arrayPopFront([1, 2, 3]) AS res
 SELECT arrayPushBack(['a'], 'b') AS res
 ```
 
-    ┌─res───────┐
-    │ ['a','b'] │
-    └───────────┘
+``` text
+┌─res───────┐
+│ ['a','b'] │
+└───────────┘
+```
 
 ## arrayPushFront {#arraypushfront}
 
 将一个元素添加到数组的开头。
 
-    arrayPushFront(array, single_value)
+``` sql
+arrayPushFront(array, single_value)
+```
 
 **参数**
 
@@ -353,15 +543,19 @@ SELECT arrayPushBack(['a'], 'b') AS res
 SELECT arrayPushFront(['b'], 'a') AS res
 ```
 
-    ┌─res───────┐
-    │ ['a','b'] │
-    └───────────┘
+``` text
+┌─res───────┐
+│ ['a','b'] │
+└───────────┘
+```
 
 ## arrayResize {#arrayresize}
 
 更改数组的长度。
 
-    arrayResize(array, size[, extender])
+``` sql
+arrayResize(array, size[, extender])
+```
 
 **参数:**
 
@@ -377,23 +571,33 @@ SELECT arrayPushFront(['b'], 'a') AS res
 
 **调用示例**
 
-    SELECT arrayResize([1], 3)
+``` sql
+SELECT arrayResize([1], 3);
+```
 
-    ┌─arrayResize([1], 3)─┐
-    │ [1,0,0]             │
-    └─────────────────────┘
+``` text
+┌─arrayResize([1], 3)─┐
+│ [1,0,0]             │
+└─────────────────────┘
+```
 
-    SELECT arrayResize([1], 3, NULL)
+``` sql
+SELECT arrayResize([1], 3, NULL);
+```
 
-    ┌─arrayResize([1], 3, NULL)─┐
-    │ [1,NULL,NULL]             │
-    └───────────────────────────┘
+``` text
+┌─arrayResize([1], 3, NULL)─┐
+│ [1,NULL,NULL]             │
+└───────────────────────────┘
+```
 
 ## arraySlice {#arrayslice}
 
 返回一个子数组，包含从指定位置的指定长度的元素。
 
-    arraySlice(array, offset[, length])
+``` sql
+arraySlice(array, offset[, length])
+```
 
 **参数**
 
@@ -407,9 +611,11 @@ SELECT arrayPushFront(['b'], 'a') AS res
 SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res
 ```
 
-    ┌─res────────┐
-    │ [2,NULL,4] │
-    └────────────┘
+``` text
+┌─res────────┐
+│ [2,NULL,4] │
+└────────────┘
+```
 
 设置为«NULL»的数组元素作为普通的数组元素值处理。
 
@@ -423,9 +629,11 @@ SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res
 SELECT arraySort([1, 3, 3, 0]);
 ```
 
-    ┌─arraySort([1, 3, 3, 0])─┐
-    │ [0,1,3,3]               │
-    └─────────────────────────┘
+``` text
+┌─arraySort([1, 3, 3, 0])─┐
+│ [0,1,3,3]               │
+└─────────────────────────┘
+```
 
 字符串排序示例:
 
@@ -433,9 +641,11 @@ SELECT arraySort([1, 3, 3, 0]);
 SELECT arraySort(['hello', 'world', '!']);
 ```
 
-    ┌─arraySort(['hello', 'world', '!'])─┐
-    │ ['!','hello','world']              │
-    └────────────────────────────────────┘
+``` text
+┌─arraySort(['hello', 'world', '!'])─┐
+│ ['!','hello','world']              │
+└────────────────────────────────────┘
+```
 
 `NULL`，`NaN`和`Inf`的排序顺序：
 
@@ -443,9 +653,11 @@ SELECT arraySort(['hello', 'world', '!']);
 SELECT arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]);
 ```
 
-    ┌─arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf])─┐
-    │ [-inf,-4,1,2,3,inf,nan,nan,NULL,NULL]                     │
-    └───────────────────────────────────────────────────────────┘
+``` text
+┌─arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf])─┐
+│ [-inf,-4,1,2,3,inf,nan,nan,NULL,NULL]                     │
+└───────────────────────────────────────────────────────────┘
+```
 
 -   `-Inf` 是数组中的第一个。
 -   `NULL` 是数组中的最后一个。
@@ -460,9 +672,11 @@ SELECT arraySort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]);
 SELECT arraySort((x) -> -x, [1, 2, 3]) as res;
 ```
 
-    ┌─res─────┐
-    │ [3,2,1] │
-    └─────────┘
+``` text
+┌─res─────┐
+│ [3,2,1] │
+└─────────┘
+```
 
 对于源数组的每个元素，lambda函数返回排序键，即\[1 -\> -1, 2 -\> -2, 3 -\> -3\]。由于`arraySort`函数按升序对键进行排序，因此结果为\[3,2,1\]。因此，`(x) -> -x` lambda函数将排序设置为[降序](#array_functions-reverse-sort)。
 
@@ -472,9 +686,11 @@ lambda函数可以接受多个参数。在这种情况下，您需要为`arraySo
 SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 ```
 
-    ┌─res────────────────┐
-    │ ['world', 'hello'] │
-    └────────────────────┘
+``` text
+┌─res────────────────┐
+│ ['world', 'hello'] │
+└────────────────────┘
+```
 
 这里，在第二个数组（\[2, 1\]）中定义了第一个数组（\[‘hello’，‘world’\]）的相应元素的排序键，即\[‘hello’ -\> 2，‘world’ -\> 1\]。 由于lambda函数中没有使用`x`，因此源数组中的实际值不会影响结果的顺序。所以，’world’将是结果中的第一个元素，’hello’将是结果中的第二个元素。
 
@@ -484,7 +700,7 @@ SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 SELECT arraySort((x, y) -> y, [0, 1, 2], ['c', 'b', 'a']) as res;
 ```
 
-``` sql
+``` text
 ┌─res─────┐
 │ [2,1,0] │
 └─────────┘
@@ -494,7 +710,7 @@ SELECT arraySort((x, y) -> y, [0, 1, 2], ['c', 'b', 'a']) as res;
 SELECT arraySort((x, y) -> -y, [0, 1, 2], [1, 2, 3]) as res;
 ```
 
-``` sql
+``` text
 ┌─res─────┐
 │ [2,1,0] │
 └─────────┘
@@ -513,9 +729,11 @@ SELECT arraySort((x, y) -> -y, [0, 1, 2], [1, 2, 3]) as res;
 SELECT arrayReverseSort([1, 3, 3, 0]);
 ```
 
-    ┌─arrayReverseSort([1, 3, 3, 0])─┐
-    │ [3,3,1,0]                      │
-    └────────────────────────────────┘
+``` text
+┌─arrayReverseSort([1, 3, 3, 0])─┐
+│ [3,3,1,0]                      │
+└────────────────────────────────┘
+```
 
 字符串排序示例:
 
@@ -523,9 +741,11 @@ SELECT arrayReverseSort([1, 3, 3, 0]);
 SELECT arrayReverseSort(['hello', 'world', '!']);
 ```
 
-    ┌─arrayReverseSort(['hello', 'world', '!'])─┐
-    │ ['world','hello','!']                     │
-    └───────────────────────────────────────────┘
+``` text
+┌─arrayReverseSort(['hello', 'world', '!'])─┐
+│ ['world','hello','!']                     │
+└───────────────────────────────────────────┘
+```
 
 `NULL`，`NaN`和`Inf`的排序顺序：
 
@@ -533,7 +753,7 @@ SELECT arrayReverseSort(['hello', 'world', '!']);
 SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]) as res;
 ```
 
-``` sql
+``` text
 ┌─res───────────────────────────────────┐
 │ [inf,3,2,1,-4,-inf,nan,nan,NULL,NULL] │
 └───────────────────────────────────────┘
@@ -550,11 +770,12 @@ SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, -4, NULL, inf, -inf]) as res;
 SELECT arrayReverseSort((x) -> -x, [1, 2, 3]) as res;
 ```
 
-    ┌─res─────┐
-    │ [1,2,3] │
-    └─────────┘
+``` text
+┌─res─────┐
+│ [1,2,3] │
+└─────────┘
+```
 
-数组按以下方式排序：
 数组按以下方式排序:
 
 1.  首先，根据lambda函数的调用结果对源数组（\[1, 2, 3\]）进行排序。 结果是\[3, 2, 1\]。
@@ -566,7 +787,7 @@ lambda函数可以接受多个参数。在这种情况下，您需要为`arrayRe
 SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 ```
 
-``` sql
+``` text
 ┌─res───────────────┐
 │ ['hello','world'] │
 └───────────────────┘
@@ -583,7 +804,7 @@ SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 SELECT arrayReverseSort((x, y) -> y, [4, 3, 5], ['a', 'b', 'c']) AS res;
 ```
 
-``` sql
+``` text
 ┌─res─────┐
 │ [5,3,4] │
 └─────────┘
@@ -593,7 +814,7 @@ SELECT arrayReverseSort((x, y) -> y, [4, 3, 5], ['a', 'b', 'c']) AS res;
 SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
 ```
 
-``` sql
+``` text
 ┌─res─────┐
 │ [4,3,5] │
 └─────────┘
@@ -610,35 +831,108 @@ SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
 
 一个特殊的功能。请参见[«ArrayJoin函数»](array-join.md#functions_arrayjoin)部分。
 
-## arrayDifference(arr) {#arraydifferencearr}
+## arrayDifference {#arraydifference}
 
-返回一个数组，其中包含所有相邻元素对之间的差值。例如：
+计算相邻数组元素之间的差异。返回一个数组，其中第一个元素为 0，第二个是 `a[1] - a[0]` 之差等。结果数组中元素的类型由减法的类型推断规则确定（例如`UInt8` - `UInt8` = `Int16`）。
+
+**语法**
 
 ``` sql
-SELECT arrayDifference([1, 2, 3, 4])
+arrayDifference(array)
 ```
 
-    ┌─arrayDifference([1, 2, 3, 4])─┐
-    │ [0,1,1,1]                     │
-    └───────────────────────────────┘
+**参数**
 
-## arrayDistinct(arr) {#arraydistinctarr}
+-   `array` –类型为[数组](https://clickhouse.com/docs/en/data_types/array/)。
 
-返回一个包含所有数组中不同元素的数组。例如：
+**返回值**
+
+返回相邻元素之间的差异数组。
+
+类型: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.com/docs/en/data_types/float/)。
+
+**示例**
+
+查询语句:
 
 ``` sql
-SELECT arrayDistinct([1, 2, 2, 3, 1])
+SELECT arrayDifference([1, 2, 3, 4]);
 ```
 
-    ┌─arrayDistinct([1, 2, 2, 3, 1])─┐
-    │ [1,2,3]                        │
-    └────────────────────────────────┘
+结果:
+
+``` text
+┌─arrayDifference([1, 2, 3, 4])─┐
+│ [0,1,1,1]                     │
+└───────────────────────────────┘
+```
+
+由于结果类型为Int64导致的溢出示例:
+
+查询语句:
+
+``` sql
+SELECT arrayDifference([0, 10000000000000000000]);
+```
+
+结果:
+
+``` text
+┌─arrayDifference([0, 10000000000000000000])─┐
+│ [0,-8446744073709551616]                   │
+└────────────────────────────────────────────┘
+```
+## arrayDistinct {#arraydistinctarr}
+
+返回一个包含所有数组中不同元素的数组。
+
+**语法**
+
+``` sql
+arrayDistinct(array)
+```
+
+**参数**
+
+-   `array` –类型为[数组](https://clickhouse.com/docs/en/data_types/array/)。
+
+**返回值**
+
+返回一个包含不同元素的数组。
+
+**示例**
+
+查询语句:
+
+``` sql
+SELECT arrayDistinct([1, 2, 2, 3, 1]);
+```
+
+结果:
+
+``` text
+┌─arrayDistinct([1, 2, 2, 3, 1])─┐
+│ [1,2,3]                        │
+└────────────────────────────────┘
+```
 
 ## arrayEnumerateDense(arr) {#arrayenumeratedensearr}
 
 返回与源数组大小相同的数组，指示每个元素首次出现在源数组中的位置。例如：arrayEnumerateDense（\[10,20,10,30\]）= \[1,2,1,3\]。
 
-## arrayIntersect(arr) {#arrayintersectarr}
+示例:
+
+``` sql
+SELECT arrayEnumerateDense([10, 20, 10, 30])
+```
+
+``` text
+┌─arrayEnumerateDense([10, 20, 10, 30])─┐
+│ [1,2,1,3]                             │
+└───────────────────────────────────────┘
+```
+
+## arrayIntersect(arr) {#array-functions-arrayintersect}
 
 返回所有数组元素的交集。例如：
 
@@ -648,18 +942,755 @@ SELECT
     arrayIntersect([1, 2], [1, 3], [1, 4]) AS intersect
 ```
 
-    ┌─no_intersect─┬─intersect─┐
-    │ []           │ [1]       │
-    └──────────────┴───────────┘
+``` text
+┌─no_intersect─┬─intersect─┐
+│ []           │ [1]       │
+└──────────────┴───────────┘
+```
 
-## arrayReduce(agg_func, arr1, …) {#arrayreduceagg-func-arr1}
+## arrayReduce {#arrayreduce}
 
-将聚合函数应用于数组并返回其结果。如果聚合函数具有多个参数，则此函数可应用于相同大小的多个数组。
+将聚合函数应用于数组元素并返回其结果。聚合函数的名称以单引号 `'max'`、`'sum'` 中的字符串形式传递。使用参数聚合函数时，参数在括号中的函数名称后指示“uniqUpTo(6)”。
 
-arrayReduce（‘agg_func’，arr1，…） - 将聚合函数`agg_func`应用于数组`arr1 ...`。如果传递了多个数组，则相应位置上的元素将作为多个参数传递给聚合函数。例如：SELECT arrayReduce（‘max’，\[1,2,3\]）= 3
+**语法**
 
-## arrayReverse(arr) {#arrayreversearr}
+``` sql
+arrayReduce(agg_func, arr1, arr2, ..., arrN)
+```
 
-返回与源数组大小相同的数组，包含反转源数组的所有元素的结果。
+**参数**
+
+-   `agg_func` — 聚合函数的名称，应该是一个常量[string](../../sql-reference/data-types/string.md)。
+-   `arr` — 任意数量的[数组](../../sql-reference/data-types/array.md)类型列作为聚合函数的参数。
+
+**返回值**
+
+**示例**
+
+查询语句:
+
+``` sql
+SELECT arrayReduce('max', [1, 2, 3]);
+```
+
+结果:
+
+``` text
+┌─arrayReduce('max', [1, 2, 3])─┐
+│                             3 │
+└───────────────────────────────┘
+```
+
+如果聚合函数采用多个参数，则该函数必须应用于多个相同大小的数组。
+
+查询语句:
+
+``` sql
+SELECT arrayReduce('maxIf', [3, 5], [1, 0]);
+```
+
+结果:
+
+``` text
+┌─arrayReduce('maxIf', [3, 5], [1, 0])─┐
+│                                    3 │
+└──────────────────────────────────────┘
+```
+
+带有参数聚合函数的示例：
+
+查询语句:
+
+``` sql
+SELECT arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+```
+
+结果:
+
+``` text
+┌─arrayReduce('uniqUpTo(3)', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])─┐
+│                                                           4 │
+└─────────────────────────────────────────────────────────────┘
+```
+
+## arrayReduceInRanges {#arrayreduceinranges}
+
+将聚合函数应用于给定范围内的数组元素，并返回一个包含与每个范围对应的结果的数组。该函数将返回与多个 `arrayReduce(agg_func, arraySlice(arr1, index, length), ...)` 相同的结果。
+
+**语法**
+
+``` sql
+arrayReduceInRanges(agg_func, ranges, arr1, arr2, ..., arrN)
+```
+
+**参数**
+
+-   `agg_func` — 聚合函数的名称，应该是一个常量[string](../../sql-reference/data-types/string.md)。
+-   `ranges` — 要聚合的范围应该是[元组](../../sql-reference/data-types/tuple.md)为元素的[数组](../../sql-reference/data-types/array.md)，其中包含每个索引和长度范围。
+-   `arr` — 任意数量的[数组](../../sql-reference/data-types/array.md)类型列作为聚合函数的参数。
+
+**返回值**
+
+-   包含指定范围内聚合函数结果的数组。
+
+类型为: [数组](../../sql-reference/data-types/array.md).
+
+**示例**
+
+查询语句:
+
+``` sql
+SELECT arrayReduceInRanges(
+    'sum',
+    [(1, 5), (2, 3), (3, 4), (4, 4)],
+    [1000000, 200000, 30000, 4000, 500, 60, 7]
+) AS res
+```
+
+结果:
+
+``` text
+┌─res─────────────────────────┐
+│ [1234500,234000,34560,4567] │
+└─────────────────────────────┘
+```
+
+## arrayReverse(arr) {#arrayreverse}
+
+返回一个与原始数组大小相同的数组，其中包含相反顺序的元素。
+
+示例:
+
+``` sql
+SELECT arrayReverse([1, 2, 3])
+```
+
+``` text
+┌─arrayReverse([1, 2, 3])─┐
+│ [3,2,1]                 │
+└─────────────────────────┘
+```
+
+## reverse(arr) {#array-functions-reverse}
+
+与[“arrayReverse”](#arrayreverse)作用相同。
+
+## arrayFlatten {#arrayflatten}
+
+将嵌套的数组展平。
+
+函数:
+
+-   适用于任何深度的嵌套数组。
+-   不会更改已经展平的数组。
+
+展平后的数组包含来自所有源数组的所有元素。
+
+**语法**
+
+``` sql
+flatten(array_of_arrays)
+```
+
+别名: `flatten`.
+
+**参数**
+
+-   `array_of_arrays` — 嵌套[数组](../../sql-reference/data-types/array.md)。 例如：`[[1,2,3], [4,5]]`。
+
+**示例**
+
+``` sql
+SELECT flatten([[[1]], [[2], [3]]]);
+```
+
+``` text
+┌─flatten(array(array([1]), array([2], [3])))─┐
+│ [1,2,3]                                     │
+└─────────────────────────────────────────────┘
+```
+
+## arrayCompact {#arraycompact}
+
+从数组中删除连续的重复元素。结果值的顺序由源数组中的顺序决定。
+
+**语法**
+
+``` sql
+arrayCompact(arr)
+```
+
+**参数**
+
+`arr` — 类型为[数组](../../sql-reference/data-types/array.md)。
+
+**返回值**
+
+没有重复元素的数组。
+
+类型为: `Array`。
+
+**示例**
+
+查询语句:
+
+``` sql
+SELECT arrayCompact([1, 1, nan, nan, 2, 3, 3, 3]);
+```
+
+结果:
+
+``` text
+┌─arrayCompact([1, 1, nan, nan, 2, 3, 3, 3])─┐
+│ [1,nan,nan,2,3]                            │
+└────────────────────────────────────────────┘
+```
+
+## arrayZip {#arrayzip}
+
+将多个数组组合成一个数组。结果数组包含按列出的参数顺序分组为元组的源数组的相应元素。
+
+**语法**
+
+``` sql
+arrayZip(arr1, arr2, ..., arrN)
+```
+
+**参数**
+
+-   `arrN` — N个[数组](../../sql-reference/data-types/array.md)。
+
+该函数可以采用任意数量的不同类型的数组。所有输入数组的大小必须相等。
+
+**返回值**
+  
+- 将源数组中的元素分组为[元组](../../sql-reference/data-types/tuple.md)的数组。元组中的数据类型与输入数组的类型相同，并且与传递数组的顺序相同。
+
+类型为: [数组](../../sql-reference/data-types/array.md)。
+
+**示例**
+
+查询语句:
+
+``` sql
+SELECT arrayZip(['a', 'b', 'c'], [5, 2, 1]);
+```
+
+结果:
+
+``` text
+┌─arrayZip(['a', 'b', 'c'], [5, 2, 1])─┐
+│ [('a',5),('b',2),('c',1)]            │
+└──────────────────────────────────────┘
+```
+
+## arrayAUC {#arrayauc}
+
+计算AUC (ROC曲线下的面积，这是机器学习中的一个概念，更多细节请查看：https://en.wikipedia.org/wiki/Receiver_operating_characteristic#Area_under_the_curve)。
+
+**语法**
+
+``` sql
+arrayAUC(arr_scores, arr_labels)
+```
+
+**参数**
+
+- `arr_scores` — 分数预测模型给出。
+- `arr_labels` — 样本的标签，通常为 1 表示正样本，0 表示负样本。
+
+**返回值**
+
+返回 Float64 类型的 AUC 值。
+
+**示例**
+
+查询语句:
+
+``` sql
+select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1]);
+```
+
+结果:
+
+``` text
+┌─arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])─┐
+│                                          0.75 │
+└───────────────────────────────────────────────┘
+```
+
+## arrayMap(func, arr1, …) {#array-map}
+
+将从 `func` 函数的原始应用中获得的数组返回给 `arr` 数组中的每个元素。
+
+示例:
+
+``` sql
+SELECT arrayMap(x -> (x + 2), [1, 2, 3]) as res;
+```
+
+``` text
+┌─res─────┐
+│ [3,4,5] │
+└─────────┘
+```
+
+下面的例子展示了如何从不同的数组创建一个元素的元组：
+
+``` sql
+SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) AS res
+```
+
+``` text
+┌─res─────────────────┐
+│ [(1,4),(2,5),(3,6)] │
+└─────────────────────┘
+```
+
+请注意，`arrayMap` 是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。 您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayFilter(func, arr1, …) {#array-filter}
+
+返回一个仅包含 `arr1` 中的元素的数组，其中 `func` 返回的值不是 0。
+
+示例:
+
+``` sql
+SELECT arrayFilter(x -> x LIKE '%World%', ['Hello', 'abc World']) AS res
+```
+
+``` text
+┌─res───────────┐
+│ ['abc World'] │
+└───────────────┘
+```
+
+``` sql
+SELECT
+    arrayFilter(
+        (i, x) -> x LIKE '%World%',
+        arrayEnumerate(arr),
+        ['Hello', 'abc World'] AS arr)
+    AS res
+```
+
+``` text
+┌─res─┐
+│ [2] │
+└─────┘
+```
+
+请注意，`arrayFilter`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。 您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayFill(func, arr1, …) {#array-fill}
+
+从第一个元素到最后一个元素扫描`arr1`，如果`func`返回0，则用`arr1[i - 1]`替换`arr1[i]`。`arr1`的第一个元素不会被替换。
+
+示例:
+
+``` sql
+SELECT arrayFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
+```
+
+``` text
+┌─res──────────────────────────────┐
+│ [1,1,3,11,12,12,12,5,6,14,14,14] │
+└──────────────────────────────────┘
+```
+
+请注意，`arrayFill` 是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。 您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayReverseFill(func, arr1, …) {#array-reverse-fill}
+
+从最后一个元素到第一个元素扫描`arr1`，如果`func`返回0，则用`arr1[i + 1]`替换`arr1[i]`。`arr1`的最后一个元素不会被替换。
+
+示例:
+
+``` sql
+SELECT arrayReverseFill(x -> not isNull(x), [1, null, 3, 11, 12, null, null, 5, 6, 14, null, null]) AS res
+```
+
+``` text
+┌─res────────────────────────────────┐
+│ [1,3,3,11,12,5,5,5,6,14,NULL,NULL] │
+└────────────────────────────────────┘
+```
+
+请注意，`arrayReverseFill`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。 您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arraySplit(func, arr1, …) {#array-split}
+
+将 `arr1` 拆分为多个数组。当 `func` 返回 0 以外的值时，数组将在元素的左侧拆分。数组不会在第一个元素之前被拆分。
+
+示例:
+
+``` sql
+SELECT arraySplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
+```
+
+``` text
+┌─res─────────────┐
+│ [[1,2,3],[4,5]] │
+└─────────────────┘
+```
+
+请注意，`arraySplit`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。 您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayReverseSplit(func, arr1, …) {#array-reverse-split}
+
+将 `arr1` 拆分为多个数组。当 `func` 返回 0 以外的值时，数组将在元素的右侧拆分。数组不会在最后一个元素之后被拆分。
+
+示例:
+
+``` sql
+SELECT arrayReverseSplit((x, y) -> y, [1, 2, 3, 4, 5], [1, 0, 0, 1, 0]) AS res
+```
+
+``` text
+┌─res───────────────┐
+│ [[1],[2,3,4],[5]] │
+└───────────────────┘
+```
+
+请注意，`arrayReverseSplit`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。 您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayExists(\[func,\] arr1, …) {#arrayexistsfunc-arr1}
+
+如果 `arr` 中至少有一个元素 `func` 返回 0 以外的值，则返回 1。否则，它返回 0。
+
+请注意，`arrayExists`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayAll(\[func,\] arr1, …) {#arrayallfunc-arr1}
+
+如果 `func` 为 `arr` 中的所有元素返回 0 以外的值，则返回 1。否则，它返回 0。
+
+请注意，`arrayAll`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayFirst(func, arr1, …) {#array-first}
+
+返回 `arr1` 数组中 `func` 返回非 0 的值的第一个元素。
+
+请注意，`arrayFirst`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayLast(func, arr1, …) {#array-last}
+
+返回 `arr1` 数组中的最后一个元素，其中 `func` 返回的值不是 0。
+
+请注意，`arrayLast`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayFirstIndex(func, arr1, …) {#array-first-index}
+
+返回 `arr1` 数组中第一个元素的索引，其中 `func` 返回的值不是 0。
+
+请注意，`arrayFirstIndex`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayLastIndex(func, arr1, …) {#array-last-index}
+
+返回 `arr1` 数组中最后一个元素的索引，其中 `func` 返回的值不是 0。
+
+请注意，`arrayLastIndex`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您必须将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayMin {#array-min}
+
+返回源数组中的最小元素。
+
+如果指定了 `func` 函数，则返回此函数转换的元素的最小值。
+
+请注意，`arrayMin`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions)。您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+**语法**
+
+```sql
+arrayMin([func,] arr)
+```
+
+**参数**
+
+-   `func` — 类型为[表达式](../../sql-reference/data-types/special-data-types/expression.md)。
+-   `arr` — 类型为[数组](../../sql-reference/data-types/array.md)。
+
+**返回值**
+
+-   函数值的最小值（或数组最小值）。
+
+类型：如果指定了`func`，则匹配`func`返回值类型，否则匹配数组元素类型。
+
+**示例**
+
+查询语句:
+
+```sql
+SELECT arrayMin([1, 2, 4]) AS res;
+```
+
+结果:
+
+```text
+┌─res─┐
+│   1 │
+└─────┘
+```
+
+查询语句:
+
+```sql
+SELECT arrayMin(x -> (-x), [1, 2, 4]) AS res;
+```
+
+结果:
+
+```text
+┌─res─┐
+│  -4 │
+└─────┘
+```
+
+## arrayMax {#array-max}
+
+返回源数组中元素的最大值。
+
+如果指定了`func` 函数，则返回此函数转换的元素的最大值。
+
+请注意，`arrayMax`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions). 您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+**语法**
+
+```sql
+arrayMax([func,] arr)
+```
+
+**参数**
+
+-   `func` — 类型为[表达式](../../sql-reference/data-types/special-data-types/expression.md)。
+-   `arr` — 类型为[数组](../../sql-reference/data-types/array.md)。
+
+**返回值**
+
+-   函数值的最大值（或数组最大值）。
+
+类型：如果指定了`func`，则匹配`func`返回值类型，否则匹配数组元素类型。
+
+**示例**
+
+查询语句：
+
+```sql
+SELECT arrayMax([1, 2, 4]) AS res;
+```
+
+结果：
+
+```text
+┌─res─┐
+│   4 │
+└─────┘
+```
+
+查询语句：
+
+```sql
+SELECT arrayMax(x -> (-x), [1, 2, 4]) AS res;
+```
+
+结果：
+
+```text
+┌─res─┐
+│  -1 │
+└─────┘
+```
+
+## arraySum {#array-sum}
+
+返回源数组中元素的总和。
+
+如果指定了 `func` 函数，则返回此函数转换的元素的总和。
+
+请注意，`arraySum`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions). 您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+**语法**
+
+```sql
+arraySum([func,] arr)
+```
+
+**参数**
+
+-   `func` — 类型为[表达式](../../sql-reference/data-types/special-data-types/expression.md)。
+-   `arr` — 类型为[数组](../../sql-reference/data-types/array.md)。
+
+**返回值**
+
+-   函数值的总和（或数组总和）。
+
+类型：源数组中的十进制数（或转换后的值，如果指定了`func`）-[Decimal128](../../sql-reference/data-types/decimal.md)， 对于浮点数 — [Float64](../../sql-reference/data-types/float.md)， 对于无符号数 — [UInt64](../../sql-reference/data-types/int-uint.md)， 对于有符号数 — [Int64](../../sql-reference/data-types/int-uint.md)。
+
+**示例**
+
+查询语句：
+
+```sql
+SELECT arraySum([2, 3]) AS res;
+```
+
+结果：
+
+```text
+┌─res─┐
+│   5 │
+└─────┘
+```
+
+查询语句：
+
+```sql
+SELECT arraySum(x -> x*x, [2, 3]) AS res;
+```
+
+结果：
+
+```text
+┌─res─┐
+│  13 │
+└─────┘
+```
+
+## arrayAvg {#array-avg}
+
+返回源数组中元素的平均值。
+
+如果指定了 func 函数，则返回此函数转换的元素的平均值。
+
+请注意，`arrayAvg`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions). 您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+**语法**
+
+```sql
+arrayAvg([func,] arr)
+```
+
+**参数**
+
+-   `func` — 类型为[表达式](../../sql-reference/data-types/special-data-types/expression.md)。
+-   `arr` — 类型为[数组](../../sql-reference/data-types/array.md)。
+
+**返回值**
+
+-   函数值的平均值（或数组平均值）。
+
+类型为: [Float64](../../sql-reference/data-types/float.md).
+
+**示例**
+
+查询语句：
+
+```sql
+SELECT arrayAvg([1, 2, 4]) AS res;
+```
+
+结果：
+
+```text
+┌────────────────res─┐
+│ 2.3333333333333335 │
+└────────────────────┘
+```
+
+查询语句：
+
+```sql
+SELECT arrayAvg(x -> (x * x), [2, 4]) AS res;
+```
+
+结果：
+
+```text
+┌─res─┐
+│  10 │
+└─────┘
+```
+
+## arrayCumSum(\[func,\] arr1, …) {#arraycumsumfunc-arr1}
+
+返回源数组中元素的部分和的数组（运行总和）。如果指定了 func 函数，则数组元素的值在求和之前由该函数转换。
+
+示例:
+
+``` sql
+SELECT arrayCumSum([1, 1, 1, 1]) AS res
+```
+
+``` text
+┌─res──────────┐
+│ [1, 2, 3, 4] │
+└──────────────┘
+```
+
+请注意，`arrayCumSum`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions). 您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayCumSumNonNegative(arr) {#arraycumsumnonnegativearr}
+
+与 `arrayCumSum` 相同，返回源数组中元素的部分和的数组（运行总和）。不同的`arrayCumSum`，当返回值包含小于零的值时，将该值替换为零，并以零参数执行后续计算。例如：
+
+``` sql
+SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
+```
+
+``` text
+┌─res───────┐
+│ [1,2,0,1] │
+└───────────┘
+```
+请注意`arraySumNonNegative`是一个[高阶函数](../../sql-reference/functions/index.md#higher-order-functions). 您可以将 lambda 函数作为第一个参数传递给它，并且不能省略。
+
+## arrayProduct {#arrayproduct}
+
+将一个[数组](../../sql-reference/data-types/array.md)中的元素相乘。
+
+**语法**
+
+``` sql
+arrayProduct(arr)
+```
+
+**参数**
+
+-   `arr` — 数值类型的[数组](../../sql-reference/data-types/array.md)。
+
+**返回值**
+
+-   数组元素的乘积。
+
+类型为: [Float64](../../sql-reference/data-types/float.md).
+
+**示例**
+
+查询语句：
+
+``` sql
+SELECT arrayProduct([1,2,3,4,5,6]) as res;
+```
+
+结果：
+
+``` text
+┌─res───┐
+│ 720   │
+└───────┘
+```
+
+查询语句：
+
+``` sql
+SELECT arrayProduct([toDecimal64(1,8), toDecimal64(2,8), toDecimal64(3,8)]) as res, toTypeName(res);
+```
+
+返回值类型总是[Float64](../../sql-reference/data-types/float.md). 结果：
+
+``` text
+┌─res─┬─toTypeName(arrayProduct(array(toDecimal64(1, 8), toDecimal64(2, 8), toDecimal64(3, 8))))─┐
+│ 6   │ Float64                                                                                  │
+└─────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
 
 [来源文章](https://clickhouse.com/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index fa1664b120a..3a6dfb161a2 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -109,7 +109,7 @@ std::vector<String> Client::loadWarningMessages()
     connection->sendQuery(connection_parameters.timeouts, "SELECT message FROM system.warnings", "" /* query_id */,
                           QueryProcessingStage::Complete,
                           &global_context->getSettingsRef(),
-                          &global_context->getClientInfo(), false);
+                          &global_context->getClientInfo(), false, {});
     while (true)
     {
         Packet packet = connection->receivePacket();
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index fe52e3a825e..1d30b541ca0 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -68,6 +68,7 @@ namespace ErrorCodes
     extern const int NOT_ENOUGH_SPACE;
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_KILL;
+    extern const int BAD_ARGUMENTS;
 }
 
 }
@@ -1062,8 +1063,11 @@ namespace
         return pid;
     }
 
-    int stop(const fs::path & pid_file, bool force)
+    int stop(const fs::path & pid_file, bool force, bool do_not_kill)
     {
+        if (force && do_not_kill)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Specified flags are incompatible");
+
         UInt64 pid = isRunning(pid_file);
 
         if (!pid)
@@ -1092,9 +1096,15 @@ namespace
 
         if (try_num == num_tries)
         {
-            fmt::print("Will terminate forcefully.\n", pid);
+            if (do_not_kill)
+            {
+                fmt::print("Process (pid = {}) is still running. Will not try to kill it.\n", pid);
+                return 1;
+            }
+
+            fmt::print("Will terminate forcefully (pid = {}).\n", pid);
             if (0 == kill(pid, 9))
-                fmt::print("Sent kill signal.\n", pid);
+                fmt::print("Sent kill signal (pid = {}).\n", pid);
             else
                 throwFromErrno("Cannot send kill signal", ErrorCodes::SYSTEM_ERROR);
 
@@ -1175,6 +1185,7 @@ int mainEntryClickHouseStop(int argc, char ** argv)
             ("prefix", po::value<std::string>()->default_value("/"), "prefix for all paths")
             ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
             ("force", po::bool_switch(), "Stop with KILL signal instead of TERM")
+            ("do-not-kill", po::bool_switch(), "Do not send KILL even if TERM did not help")
         ;
 
         po::variables_map options;
@@ -1189,7 +1200,9 @@ int mainEntryClickHouseStop(int argc, char ** argv)
         fs::path prefix = options["prefix"].as<std::string>();
         fs::path pid_file = prefix / options["pid-path"].as<std::string>() / "clickhouse-server.pid";
 
-        return stop(pid_file, options["force"].as<bool>());
+        bool force = options["force"].as<bool>();
+        bool do_not_kill = options["do-not-kill"].as<bool>();
+        return stop(pid_file, force, do_not_kill);
     }
     catch (...)
     {
@@ -1247,6 +1260,7 @@ int mainEntryClickHouseRestart(int argc, char ** argv)
             ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
             ("user", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_USER), "clickhouse user")
             ("force", po::value<bool>()->default_value(false), "Stop with KILL signal instead of TERM")
+            ("do-not-kill", po::bool_switch(), "Do not send KILL even if TERM did not help")
         ;
 
         po::variables_map options;
@@ -1265,7 +1279,9 @@ int mainEntryClickHouseRestart(int argc, char ** argv)
         fs::path config = prefix / options["config-path"].as<std::string>() / "config.xml";
         fs::path pid_file = prefix / options["pid-path"].as<std::string>() / "clickhouse-server.pid";
 
-        if (int res = stop(pid_file, options["force"].as<bool>()))
+        bool force = options["force"].as<bool>();
+        bool do_not_kill = options["do-not-kill"].as<bool>();
+        if (int res = stop(pid_file, force, do_not_kill))
             return res;
 
         return start(user, executable, config, pid_file);
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 02c985b6efb..2b1a0809143 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -540,7 +540,7 @@ static void sanityChecks(Server & server)
     try
     {
         if (readString("/sys/devices/system/clocksource/clocksource0/current_clocksource").find("tsc") == std::string::npos)
-            server.context()->addWarningMessage("Linux is not using fast TSC clock source. Performance can be degraded.");
+            server.context()->addWarningMessage("Linux is not using a fast TSC clock source. Performance can be degraded.");
     }
     catch (...)
     {
@@ -558,7 +558,7 @@ static void sanityChecks(Server & server)
     try
     {
         if (readString("/sys/kernel/mm/transparent_hugepage/enabled").find("[always]") != std::string::npos)
-            server.context()->addWarningMessage("Linux transparent hugepage are set to \"always\".");
+            server.context()->addWarningMessage("Linux transparent hugepages are set to \"always\".");
     }
     catch (...)
     {
@@ -1088,11 +1088,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
             total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
 
             auto * global_overcommit_tracker = global_context->getGlobalOvercommitTracker();
-            if (config->has("global_memory_usage_overcommit_max_wait_microseconds"))
-            {
-                UInt64 max_overcommit_wait_time = config->getUInt64("global_memory_usage_overcommit_max_wait_microseconds", 0);
-                global_overcommit_tracker->setMaxWaitTime(max_overcommit_wait_time);
-            }
+            UInt64 max_overcommit_wait_time = config->getUInt64("global_memory_usage_overcommit_max_wait_microseconds", 200);
+            global_overcommit_tracker->setMaxWaitTime(max_overcommit_wait_time);
             total_memory_tracker.setOvercommitTracker(global_overcommit_tracker);
 
             // FIXME logging-related things need synchronization -- see the 'Logger * log' saved
@@ -1294,17 +1291,11 @@ int Server::main(const std::vector<std::string> & /*args*/)
         LOG_INFO(log, "Listening for {}", server.getDescription());
     }
 
-    auto & access_control = global_context->getAccessControl();
-    if (config().has("custom_settings_prefixes"))
-        access_control.setCustomSettingsPrefixes(config().getString("custom_settings_prefixes"));
-
-    access_control.setNoPasswordAllowed(config().getBool("allow_no_password", true));
-    access_control.setPlaintextPasswordAllowed(config().getBool("allow_plaintext_password", true));
-
     /// Initialize access storages.
+    auto & access_control = global_context->getAccessControl();
     try
     {
-        access_control.addStoragesFromMainConfig(config(), config_path, [&] { return global_context->getZooKeeper(); });
+        access_control.setUpFromMainConfig(config(), config_path, [&] { return global_context->getZooKeeper(); });
     }
     catch (...)
     {
diff --git a/programs/server/config.xml b/programs/server/config.xml
index f5f22d1fcdf..bd54051be19 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -545,6 +545,14 @@
         -->
     </user_directories>
 
+    <access_control_improvements>
+        <!-- Enables logic that users without permissive row policies can still read rows using a SELECT query.
+             For example, if there two users A, B and a row policy is defined only for A, then
+             if this setting is true the user B will see all rows, and if this setting is false the user B will see no rows.
+             By default this setting is false for compatibility with earlier access configurations. -->
+        <users_without_row_policies_can_read_rows>false</users_without_row_policies_can_read_rows>
+    </access_control_improvements>
+
     <!-- Default profile of settings. -->
     <default_profile>default</default_profile>
 
diff --git a/programs/server/play.html b/programs/server/play.html
index 06fc5d8de9a..a36cebb5b02 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -129,8 +129,8 @@
 
         #query_div
         {
-            /* Make enough space for even huge queries. */
-            height: 20%;
+            /* Make enough space for medium/large queries but allowing query textarea to grow. */
+            min-height: 20%;
         }
 
         #query
diff --git a/programs/server/users.xml b/programs/server/users.xml
index f18562071d8..96067d01a6b 100644
--- a/programs/server/users.xml
+++ b/programs/server/users.xml
@@ -6,9 +6,6 @@
     <profiles>
         <!-- Default settings. -->
         <default>
-            <!-- Maximum memory usage for processing single query, in bytes. -->
-            <max_memory_usage>10000000000</max_memory_usage>
-
             <!-- How to choose between replicas during distributed query processing.
                  random - choose random replica from set of replicas with minimum number of errors
                  nearest_hostname - from set of replicas with minimum number of errors, choose replica
diff --git a/src/Access/AccessControl.cpp b/src/Access/AccessControl.cpp
index 91ffd7f04ab..263b8d0604f 100644
--- a/src/Access/AccessControl.cpp
+++ b/src/Access/AccessControl.cpp
@@ -149,6 +149,24 @@ AccessControl::AccessControl()
 
 AccessControl::~AccessControl() = default;
 
+
+void AccessControl::setUpFromMainConfig(const Poco::Util::AbstractConfiguration & config_, const String & config_path_,
+                                        const zkutil::GetZooKeeper & get_zookeeper_function_)
+{
+    if (config_.has("custom_settings_prefixes"))
+        setCustomSettingsPrefixes(config_.getString("custom_settings_prefixes"));
+
+    setNoPasswordAllowed(config_.getBool("allow_no_password", true));
+    setPlaintextPasswordAllowed(config_.getBool("allow_plaintext_password", true));
+
+    setEnabledUsersWithoutRowPoliciesCanReadRows(config_.getBool(
+        "access_control_improvements.users_without_row_policies_can_read_rows",
+        false /* false because we need to be compatible with earlier access configurations */));
+
+    addStoragesFromMainConfig(config_, config_path_, get_zookeeper_function_);
+}
+
+
 void AccessControl::setUsersConfig(const Poco::Util::AbstractConfiguration & users_config_)
 {
     auto storages = getStoragesPtr();
@@ -170,11 +188,7 @@ void AccessControl::addUsersConfigStorage(const Poco::Util::AbstractConfiguratio
 
 void AccessControl::addUsersConfigStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & users_config_)
 {
-    auto check_setting_name_function = [this](const std::string_view & setting_name) { checkSettingNameIsAllowed(setting_name); };
-    auto is_no_password_allowed_function = [this]() -> bool { return isNoPasswordAllowed(); };
-    auto is_plaintext_password_allowed_function = [this]() -> bool { return isPlaintextPasswordAllowed(); };
-    auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, check_setting_name_function,
-                                                                  is_no_password_allowed_function, is_plaintext_password_allowed_function);
+    auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, *this);
     new_storage->setConfig(users_config_);
     addStorage(new_storage);
     LOG_DEBUG(getLogger(), "Added {} access storage '{}', path: {}",
@@ -207,11 +221,7 @@ void AccessControl::addUsersConfigStorage(
                 return;
         }
     }
-    auto check_setting_name_function = [this](const std::string_view & setting_name) { checkSettingNameIsAllowed(setting_name); };
-    auto is_no_password_allowed_function = [this]() -> bool { return isNoPasswordAllowed(); };
-    auto is_plaintext_password_allowed_function = [this]() -> bool { return isPlaintextPasswordAllowed(); };
-    auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, check_setting_name_function,
-                                                                  is_no_password_allowed_function, is_plaintext_password_allowed_function);
+    auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, *this);
     new_storage->load(users_config_path_, include_from_path_, preprocessed_dir_, get_zookeeper_function_);
     addStorage(new_storage);
     LOG_DEBUG(getLogger(), "Added {} access storage '{}', path: {}", String(new_storage->getStorageType()), new_storage->getStorageName(), new_storage->getPath());
diff --git a/src/Access/AccessControl.h b/src/Access/AccessControl.h
index 0ac3d9cb0c2..954fec8b97f 100644
--- a/src/Access/AccessControl.h
+++ b/src/Access/AccessControl.h
@@ -50,6 +50,9 @@ public:
     AccessControl();
     ~AccessControl() override;
 
+    void setUpFromMainConfig(const Poco::Util::AbstractConfiguration & config_, const String & config_path_,
+                             const zkutil::GetZooKeeper & get_zookeeper_function_);
+
     /// Parses access entities from a configuration loaded from users.xml.
     /// This function add UsersConfigAccessStorage if it wasn't added before.
     void setUsersConfig(const Poco::Util::AbstractConfiguration & users_config_);
@@ -122,6 +125,12 @@ public:
     void setPlaintextPasswordAllowed(const bool allow_plaintext_password_);
     bool isPlaintextPasswordAllowed() const;
 
+    /// Enables logic that users without permissive row policies can still read rows using a SELECT query.
+    /// For example, if there two users A, B and a row policy is defined only for A, then
+    /// if this setting is true the user B will see all rows, and if this setting is false the user B will see no rows.
+    void setEnabledUsersWithoutRowPoliciesCanReadRows(bool enable) { users_without_row_policies_can_read_rows = enable; }
+    bool isEnabledUsersWithoutRowPoliciesCanReadRows() const { return users_without_row_policies_can_read_rows; }
+
     UUID authenticate(const Credentials & credentials, const Poco::Net::IPAddress & address) const;
     void setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfiguration & config);
 
@@ -178,6 +187,7 @@ private:
     std::unique_ptr<CustomSettingsPrefixes> custom_settings_prefixes;
     std::atomic_bool allow_plaintext_password = true;
     std::atomic_bool allow_no_password = true;
+    std::atomic_bool users_without_row_policies_can_read_rows = false;
 };
 
 }
diff --git a/src/Access/RowPolicyCache.cpp b/src/Access/RowPolicyCache.cpp
index 55bec427158..34549e3fa62 100644
--- a/src/Access/RowPolicyCache.cpp
+++ b/src/Access/RowPolicyCache.cpp
@@ -28,17 +28,25 @@ namespace
                 permissions.push_back(filter);
         }
 
-        ASTPtr getResult() &&
+        ASTPtr getResult(bool users_without_row_policies_can_read_rows) &&
         {
-            /// Process permissive filters.
-            restrictions.push_back(makeASTForLogicalOr(std::move(permissions)));
+            if (!permissions.empty() || !users_without_row_policies_can_read_rows)
+            {
+                /// Process permissive filters.
+                restrictions.push_back(makeASTForLogicalOr(std::move(permissions)));
+            }
 
             /// Process restrictive filters.
-            auto result = makeASTForLogicalAnd(std::move(restrictions));
+            ASTPtr result;
+            if (!restrictions.empty())
+                result = makeASTForLogicalAnd(std::move(restrictions));
 
-            bool value;
-            if (tryGetLiteralBool(result.get(), value) && value)
-                result = nullptr;  /// The condition is always true, no need to check it.
+            if (result)
+            {
+                bool value;
+                if (tryGetLiteralBool(result.get(), value) && value)
+                    result = nullptr; /// The condition is always true, no need to check it.
+            }
 
             return result;
         }
@@ -234,7 +242,7 @@ void RowPolicyCache::mixFiltersFor(EnabledRowPolicies & enabled)
     {
         auto & mixed_filter = (*mixed_filters)[key];
         mixed_filter.database_and_table_name = mixer.database_and_table_name;
-        mixed_filter.ast = std::move(mixer.mixer).getResult();
+        mixed_filter.ast = std::move(mixer.mixer).getResult(access_control.isEnabledUsersWithoutRowPoliciesCanReadRows());
     }
 
     enabled.mixed_filters.store(mixed_filters);
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index d8e043435b9..240130bbf74 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -3,6 +3,7 @@
 #include <Access/RowPolicy.h>
 #include <Access/User.h>
 #include <Access/SettingsProfile.h>
+#include <Access/AccessControl.h>
 #include <Dictionaries/IDictionary.h>
 #include <Common/Config/ConfigReloader.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -339,7 +340,7 @@ namespace
     }
 
 
-    std::vector<AccessEntityPtr> parseRowPolicies(const Poco::Util::AbstractConfiguration & config)
+    std::vector<AccessEntityPtr> parseRowPolicies(const Poco::Util::AbstractConfiguration & config, bool users_without_row_policies_can_read_rows)
     {
         std::map<std::pair<String /* database */, String /* table */>, std::unordered_map<String /* user */, String /* filter */>> all_filters_map;
 
@@ -395,8 +396,19 @@ namespace
             const auto & [database, table_name] = database_and_table_name;
             for (const String & user_name : user_names)
             {
+                String filter;
                 auto it = user_to_filters.find(user_name);
-                String filter = (it != user_to_filters.end()) ? it->second : "1";
+                if (it != user_to_filters.end())
+                {
+                    filter = it->second;
+                }
+                else
+                {
+                    if (users_without_row_policies_can_read_rows)
+                        continue;
+                    else
+                        filter = "1";
+                }
 
                 auto policy = std::make_shared<RowPolicy>();
                 policy->setFullName(user_name, database, table_name);
@@ -411,7 +423,7 @@ namespace
 
     SettingsProfileElements parseSettingsConstraints(const Poco::Util::AbstractConfiguration & config,
                                                      const String & path_to_constraints,
-                                                     Fn<void(std::string_view)> auto && check_setting_name_function)
+                                                     const AccessControl & access_control)
     {
         SettingsProfileElements profile_elements;
         Poco::Util::AbstractConfiguration::Keys keys;
@@ -419,8 +431,7 @@ namespace
 
         for (const String & setting_name : keys)
         {
-            if (check_setting_name_function)
-                check_setting_name_function(setting_name);
+            access_control.checkSettingNameIsAllowed(setting_name);
 
             SettingsProfileElement profile_element;
             profile_element.setting_name = setting_name;
@@ -448,7 +459,7 @@ namespace
     std::shared_ptr<SettingsProfile> parseSettingsProfile(
         const Poco::Util::AbstractConfiguration & config,
         const String & profile_name,
-        Fn<void(std::string_view)> auto && check_setting_name_function)
+        const AccessControl & access_control)
     {
         auto profile = std::make_shared<SettingsProfile>();
         profile->setName(profile_name);
@@ -470,13 +481,12 @@ namespace
 
             if (key == "constraints" || key.starts_with("constraints["))
             {
-                profile->elements.merge(parseSettingsConstraints(config, profile_config + "." + key, check_setting_name_function));
+                profile->elements.merge(parseSettingsConstraints(config, profile_config + "." + key, access_control));
                 continue;
             }
 
             const auto & setting_name = key;
-            if (check_setting_name_function)
-                check_setting_name_function(setting_name);
+            access_control.checkSettingNameIsAllowed(setting_name);
 
             SettingsProfileElement profile_element;
             profile_element.setting_name = setting_name;
@@ -490,7 +500,7 @@ namespace
 
     std::vector<AccessEntityPtr> parseSettingsProfiles(
         const Poco::Util::AbstractConfiguration & config,
-        Fn<void(std::string_view)> auto && check_setting_name_function)
+        const AccessControl & access_control)
     {
         Poco::Util::AbstractConfiguration::Keys profile_names;
         config.keys("profiles", profile_names);
@@ -502,7 +512,7 @@ namespace
         {
             try
             {
-                profiles.push_back(parseSettingsProfile(config, profile_name, check_setting_name_function));
+                profiles.push_back(parseSettingsProfile(config, profile_name, access_control));
             }
             catch (Exception & e)
             {
@@ -515,13 +525,8 @@ namespace
     }
 }
 
-UsersConfigAccessStorage::UsersConfigAccessStorage(const CheckSettingNameFunction & check_setting_name_function_, const IsNoPasswordFunction & is_no_password_allowed_function_, const IsPlaintextPasswordFunction & is_plaintext_password_allowed_function_)
-    : UsersConfigAccessStorage(STORAGE_TYPE, check_setting_name_function_, is_no_password_allowed_function_, is_plaintext_password_allowed_function_)
-{
-}
-
-UsersConfigAccessStorage::UsersConfigAccessStorage(const String & storage_name_, const CheckSettingNameFunction & check_setting_name_function_, const IsNoPasswordFunction & is_no_password_allowed_function_, const IsPlaintextPasswordFunction & is_plaintext_password_allowed_function_)
-    : IAccessStorage(storage_name_), check_setting_name_function(check_setting_name_function_),is_no_password_allowed_function(is_no_password_allowed_function_), is_plaintext_password_allowed_function(is_plaintext_password_allowed_function_)
+UsersConfigAccessStorage::UsersConfigAccessStorage(const String & storage_name_, const AccessControl & access_control_)
+    : IAccessStorage(storage_name_), access_control(access_control_)
 {
 }
 
@@ -563,16 +568,16 @@ void UsersConfigAccessStorage::parseFromConfig(const Poco::Util::AbstractConfigu
 {
     try
     {
-        bool no_password_allowed = is_no_password_allowed_function();
-        bool plaintext_password_allowed = is_plaintext_password_allowed_function();
+        bool no_password_allowed = access_control.isNoPasswordAllowed();
+        bool plaintext_password_allowed = access_control.isPlaintextPasswordAllowed();
         std::vector<std::pair<UUID, AccessEntityPtr>> all_entities;
         for (const auto & entity : parseUsers(config, no_password_allowed, plaintext_password_allowed))
             all_entities.emplace_back(generateID(*entity), entity);
         for (const auto & entity : parseQuotas(config))
             all_entities.emplace_back(generateID(*entity), entity);
-        for (const auto & entity : parseRowPolicies(config))
+        for (const auto & entity : parseRowPolicies(config, access_control.isEnabledUsersWithoutRowPoliciesCanReadRows()))
             all_entities.emplace_back(generateID(*entity), entity);
-        for (const auto & entity : parseSettingsProfiles(config, check_setting_name_function))
+        for (const auto & entity : parseSettingsProfiles(config, access_control))
             all_entities.emplace_back(generateID(*entity), entity);
         memory_storage.setAll(all_entities);
     }
diff --git a/src/Access/UsersConfigAccessStorage.h b/src/Access/UsersConfigAccessStorage.h
index d7ce5d4ab9d..e21eb17f462 100644
--- a/src/Access/UsersConfigAccessStorage.h
+++ b/src/Access/UsersConfigAccessStorage.h
@@ -12,6 +12,7 @@ namespace Poco::Util
 
 namespace DB
 {
+class AccessControl;
 class ConfigReloader;
 
 /// Implementation of IAccessStorage which loads all from users.xml periodically.
@@ -20,13 +21,8 @@ class UsersConfigAccessStorage : public IAccessStorage
 public:
 
     static constexpr char STORAGE_TYPE[] = "users.xml";
-    using CheckSettingNameFunction = std::function<void(const std::string_view &)>;
-    using IsNoPasswordFunction = std::function<bool()>;
-    using IsPlaintextPasswordFunction =  std::function<bool()>;
-
-    UsersConfigAccessStorage(const String & storage_name_ = STORAGE_TYPE, const CheckSettingNameFunction & check_setting_name_function_ = {}, const IsNoPasswordFunction & is_no_password_allowed_function_ ={}, const IsPlaintextPasswordFunction & is_plaintext_password_allowed_function_ = {}); /// NOLINT
-    UsersConfigAccessStorage(const CheckSettingNameFunction & check_setting_name_function_, const IsNoPasswordFunction & is_no_password_allowed_function_, const IsPlaintextPasswordFunction & is_plaintext_password_allowed_function_); /// NOLINT
 
+    UsersConfigAccessStorage(const String & storage_name_, const AccessControl & access_control_);
     ~UsersConfigAccessStorage() override;
 
     const char * getStorageType() const override { return STORAGE_TYPE; }
@@ -58,10 +54,8 @@ private:
     scope_guard subscribeForChangesImpl(const UUID & id, const OnChangedHandler & handler) const override;
     scope_guard subscribeForChangesImpl(AccessEntityType type, const OnChangedHandler & handler) const override;
 
+    const AccessControl & access_control;
     MemoryAccessStorage memory_storage;
-    CheckSettingNameFunction check_setting_name_function;
-    IsNoPasswordFunction is_no_password_allowed_function;
-    IsPlaintextPasswordFunction is_plaintext_password_allowed_function;
     String path;
     std::unique_ptr<ConfigReloader> config_reloader;
     mutable std::mutex load_mutex;
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index fcf8bfd938f..35ef55a1387 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -391,7 +391,7 @@ void ClientBase::onData(Block & block, ASTPtr parsed_query)
     processed_rows += block.rows();
 
     /// Even if all blocks are empty, we still need to initialize the output stream to write empty resultset.
-    initBlockOutputStream(block, parsed_query);
+    initOutputFormat(block, parsed_query);
 
     /// The header block containing zero rows was used to initialize
     /// output_format, do not output it.
@@ -438,14 +438,14 @@ void ClientBase::onLogData(Block & block)
 
 void ClientBase::onTotals(Block & block, ASTPtr parsed_query)
 {
-    initBlockOutputStream(block, parsed_query);
+    initOutputFormat(block, parsed_query);
     output_format->setTotals(block);
 }
 
 
 void ClientBase::onExtremes(Block & block, ASTPtr parsed_query)
 {
-    initBlockOutputStream(block, parsed_query);
+    initOutputFormat(block, parsed_query);
     output_format->setExtremes(block);
 }
 
@@ -465,7 +465,7 @@ void ClientBase::onProfileInfo(const ProfileInfo & profile_info)
 }
 
 
-void ClientBase::initBlockOutputStream(const Block & block, ASTPtr parsed_query)
+void ClientBase::initOutputFormat(const Block & block, ASTPtr parsed_query)
 try
 {
     if (!output_format)
@@ -718,7 +718,8 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
                 query_processing_stage,
                 &global_context->getSettingsRef(),
                 &global_context->getClientInfo(),
-                true);
+                true,
+                [&](const Progress & progress) { onProgress(progress); });
 
             if (send_external_tables)
                 sendExternalTables(parsed_query);
@@ -1071,7 +1072,8 @@ void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr pars
         query_processing_stage,
         &global_context->getSettingsRef(),
         &global_context->getClientInfo(),
-        true);
+        true,
+        [&](const Progress & progress) { onProgress(progress); });
 
     if (send_external_tables)
         sendExternalTables(parsed_query);
@@ -1103,7 +1105,9 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
     if (!parsed_insert_query)
         return;
 
-    if (need_render_progress)
+    bool have_data_in_stdin = !is_interactive && !stdin_is_a_tty && !std_in.eof();
+
+    if (need_render_progress && have_data_in_stdin)
     {
         /// Set total_bytes_to_read for current fd.
         FileProgress file_progress(0, std_in.size());
@@ -1113,8 +1117,6 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
         progress_indication.setFileProgressCallback(global_context, true);
     }
 
-    bool have_data_in_stdin = !is_interactive && !stdin_is_a_tty && !std_in.eof();
-
     /// If data fetched from file (maybe compressed file)
     if (parsed_insert_query->infile)
     {
@@ -1486,7 +1488,9 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
 
     if (is_interactive)
     {
-        std::cout << std::endl << processed_rows << " rows in set. Elapsed: " << progress_indication.elapsedSeconds() << " sec. ";
+        std::cout << std::endl
+            << processed_rows << " row" << (processed_rows == 1 ? "" : "s")
+            << " in set. Elapsed: " << progress_indication.elapsedSeconds() << " sec. ";
         progress_indication.writeFinalProgress();
         std::cout << std::endl << std::endl;
     }
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index 649450bbc09..d373ce5f60b 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -139,7 +139,7 @@ private:
     void sendDataFromStdin(Block & sample, const ColumnsDescription & columns_description, ASTPtr parsed_query);
     void sendExternalTables(ASTPtr parsed_query);
 
-    void initBlockOutputStream(const Block & block, ASTPtr parsed_query);
+    void initOutputFormat(const Block & block, ASTPtr parsed_query);
     void initLogsOutputStream();
 
     String prompt() const;
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 021ae2142a1..e53d55f6964 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -451,7 +451,8 @@ void Connection::sendQuery(
     UInt64 stage,
     const Settings * settings,
     const ClientInfo * client_info,
-    bool with_pending_data)
+    bool with_pending_data,
+    std::function<void(const Progress &)>)
 {
     if (!connected)
         connect(timeouts);
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index e34a0a22f42..d00a5760a8d 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -100,7 +100,8 @@ public:
         UInt64 stage/* = QueryProcessingStage::Complete */,
         const Settings * settings/* = nullptr */,
         const ClientInfo * client_info/* = nullptr */,
-        bool with_pending_data/* = false */) override;
+        bool with_pending_data/* = false */,
+        std::function<void(const Progress &)> process_progress_callback) override;
 
     void sendCancel() override;
 
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index 665f98a88d6..954396af0fa 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -179,7 +179,7 @@ void HedgedConnections::sendQuery(
             modified_settings.parallel_replica_offset = fd_to_replica_location[replica.packet_receiver->getFileDescriptor()].offset;
         }
 
-        replica.connection->sendQuery(timeouts, query, query_id, stage, &modified_settings, &client_info, with_pending_data);
+        replica.connection->sendQuery(timeouts, query, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
         replica.change_replica_timeout.setRelative(timeouts.receive_data_timeout);
         replica.packet_receiver->setReceiveTimeout(hedged_connections_factory.getConnectionTimeouts().receive_timeout);
     };
diff --git a/src/Client/IServerConnection.h b/src/Client/IServerConnection.h
index 861630a942b..dfa4873e426 100644
--- a/src/Client/IServerConnection.h
+++ b/src/Client/IServerConnection.h
@@ -90,7 +90,8 @@ public:
         UInt64 stage,
         const Settings * settings,
         const ClientInfo * client_info,
-        bool with_pending_data) = 0;
+        bool with_pending_data,
+        std::function<void(const Progress &)> process_progress_callback) = 0;
 
     virtual void sendCancel() = 0;
 
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index 49e40ef8571..77519423763 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -74,13 +74,14 @@ void LocalConnection::sendQuery(
     UInt64 stage,
     const Settings *,
     const ClientInfo *,
-    bool)
+    bool,
+    std::function<void(const Progress &)> process_progress_callback)
 {
     query_context = session.makeQueryContext();
     query_context->setCurrentQueryId(query_id);
     if (send_progress)
     {
-        query_context->setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
+        query_context->setProgressCallback([this] (const Progress & value) { this->updateProgress(value); });
         query_context->setFileProgressCallback([this](const FileProgress & value) { this->updateProgress(Progress(value)); });
     }
     if (!current_database.empty())
@@ -143,6 +144,19 @@ void LocalConnection::sendQuery(
         else if (state->io.pipeline.completed())
         {
             CompletedPipelineExecutor executor(state->io.pipeline);
+            if (process_progress_callback)
+            {
+                auto callback = [this, &process_progress_callback]()
+                {
+                    if (state->is_cancelled)
+                        return true;
+
+                    process_progress_callback(state->progress.fetchAndResetPiecewiseAtomically());
+                    return false;
+                };
+
+                executor.setCancelCallback(callback, query_context->getSettingsRef().interactive_delay / 1000);
+            }
             executor.execute();
         }
 
@@ -185,6 +199,7 @@ void LocalConnection::sendData(const Block & block, const String &, bool)
 
 void LocalConnection::sendCancel()
 {
+    state->is_cancelled = true;
     if (state->executor)
         state->executor->cancel();
 }
@@ -440,7 +455,7 @@ Packet LocalConnection::receivePacket()
         }
         case Protocol::Server::Progress:
         {
-            packet.progress = std::move(state->progress);
+            packet.progress = state->progress.fetchAndResetPiecewiseAtomically();
             state->progress.reset();
             next_packet_type.reset();
             break;
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
index ad6f94122cc..1ad6ad73238 100644
--- a/src/Client/LocalConnection.h
+++ b/src/Client/LocalConnection.h
@@ -98,7 +98,8 @@ public:
         UInt64 stage/* = QueryProcessingStage::Complete */,
         const Settings * settings/* = nullptr */,
         const ClientInfo * client_info/* = nullptr */,
-        bool with_pending_data/* = false */) override;
+        bool with_pending_data/* = false */,
+        std::function<void(const Progress &)> process_progress_callback) override;
 
     void sendCancel() override;
 
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index 31fbc609bdc..b14ff9f2c8d 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -161,14 +161,14 @@ void MultiplexedConnections::sendQuery(
                 modified_settings.parallel_replica_offset = i;
 
             replica_states[i].connection->sendQuery(timeouts, query, query_id,
-                stage, &modified_settings, &client_info, with_pending_data);
+                                                    stage, &modified_settings, &client_info, with_pending_data, {});
         }
     }
     else
     {
         /// Use single replica.
         replica_states[0].connection->sendQuery(timeouts, query, query_id,
-                stage, &modified_settings, &client_info, with_pending_data);
+                                                stage, &modified_settings, &client_info, with_pending_data, {});
     }
 
     sent_query = true;
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index 84625a768bf..de09c07f4c1 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -132,7 +132,7 @@ void Suggest::load(ContextPtr context, const ConnectionParameters & connection_p
 
 void Suggest::fetch(IServerConnection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
 {
-    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false);
+    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false, {});
 
     while (true)
     {
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index 214a9a807f5..435e6bf1fbc 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -10,6 +10,11 @@
 #include <Columns/ColumnCompressed.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
 
+#if USE_EMBEDDED_COMPILER
+#include <DataTypes/Native.h>
+#include <llvm/IR/IRBuilder.h>
+#endif
+
 
 namespace DB
 {
@@ -241,6 +246,66 @@ ColumnPtr ColumnNullable::index(const IColumn & indexes, size_t limit) const
     return ColumnNullable::create(indexed_data, indexed_null_map);
 }
 
+#if USE_EMBEDDED_COMPILER
+
+bool ColumnNullable::isComparatorCompilable() const
+{
+    return nested_column->isComparatorCompilable();
+}
+
+llvm::Value * ColumnNullable::compileComparator(llvm::IRBuilderBase & builder, llvm::Value * lhs, llvm::Value * rhs,
+                                            llvm::Value * nan_direction_hint) const
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+    auto * head = b.GetInsertBlock();
+
+    llvm::Value * lhs_unwrapped_value = b.CreateExtractValue(lhs, {0});
+    llvm::Value * lhs_is_null_value = b.CreateExtractValue(lhs, {1});
+
+    llvm::Value * rhs_unwrapped_value = b.CreateExtractValue(rhs, {0});
+    llvm::Value * rhs_is_null_value = b.CreateExtractValue(rhs, {1});
+
+    llvm::Value * lhs_or_rhs_are_null = b.CreateOr(lhs_is_null_value, rhs_is_null_value);
+
+    auto * lhs_or_rhs_are_null_block = llvm::BasicBlock::Create(head->getContext(), "lhs_or_rhs_are_null_block", head->getParent());
+    auto * lhs_rhs_are_not_null_block = llvm::BasicBlock::Create(head->getContext(), "lhs_and_rhs_are_not_null_block", head->getParent());
+    auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+
+    b.CreateCondBr(lhs_or_rhs_are_null, lhs_or_rhs_are_null_block, lhs_rhs_are_not_null_block);
+
+    // if (unlikely(lval_is_null || rval_is_null))
+    // {
+    //     if (lval_is_null && rval_is_null)
+    //         return 0;
+    //     else
+    //         return lval_is_null ? null_direction_hint : -null_direction_hint;
+    // }
+
+    b.SetInsertPoint(lhs_or_rhs_are_null_block);
+    auto * lhs_equals_rhs_result = llvm::ConstantInt::getSigned(b.getInt8Ty(), 0);
+    llvm::Value * lhs_and_rhs_are_null = b.CreateAnd(lhs_is_null_value, rhs_is_null_value);
+    llvm::Value * lhs_is_null_result = b.CreateSelect(lhs_is_null_value, nan_direction_hint, b.CreateNeg(nan_direction_hint));
+    llvm::Value * lhs_or_rhs_are_null_block_result = b.CreateSelect(lhs_and_rhs_are_null, lhs_equals_rhs_result, lhs_is_null_result);
+    b.CreateBr(join_block);
+
+    // getNestedColumn().compareAt(n, m, nested_rhs, null_direction_hint);
+
+    b.SetInsertPoint(lhs_rhs_are_not_null_block);
+    llvm::Value * lhs_rhs_are_not_null_block_result
+        = nested_column->compileComparator(builder, lhs_unwrapped_value, rhs_unwrapped_value, nan_direction_hint);
+    b.CreateBr(join_block);
+
+    b.SetInsertPoint(join_block);
+
+    auto * result = b.CreatePHI(b.getInt8Ty(), 2);
+    result->addIncoming(lhs_or_rhs_are_null_block_result, lhs_or_rhs_are_null_block);
+    result->addIncoming(lhs_rhs_are_not_null_block_result, lhs_rhs_are_not_null_block);
+
+    return result;
+}
+
+#endif
+
 int ColumnNullable::compareAtImpl(size_t n, size_t m, const IColumn & rhs_, int null_direction_hint, const Collator * collator) const
 {
     /// NULL values share the properties of NaN values.
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index a0c72182f63..60951dfcc2e 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -6,6 +6,9 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 
+#include "config_core.h"
+
+
 class Collator;
 
 namespace DB
@@ -94,6 +97,15 @@ public:
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     int compareAt(size_t n, size_t m, const IColumn & rhs_, int null_direction_hint) const override;
+
+#if USE_EMBEDDED_COMPILER
+
+    bool isComparatorCompilable() const override;
+
+    llvm::Value * compileComparator(llvm::IRBuilderBase & /*builder*/, llvm::Value * /*lhs*/, llvm::Value * /*rhs*/, llvm::Value * /*nan_direction_hint*/) const override;
+
+#endif
+
     void compareColumn(const IColumn & rhs, size_t rhs_row_num,
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override;
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 90b821bfe06..04f2efab0d7 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -25,6 +25,12 @@
 #    include <emmintrin.h>
 #endif
 
+#if USE_EMBEDDED_COMPILER
+#include <DataTypes/Native.h>
+#include <llvm/IR/IRBuilder.h>
+#endif
+
+
 namespace DB
 {
 
@@ -183,6 +189,43 @@ namespace
     };
 }
 
+#if USE_EMBEDDED_COMPILER
+
+template <typename T>
+bool ColumnVector<T>::isComparatorCompilable() const
+{
+    /// TODO: for std::is_floating_point_v<T> we need implement is_nan in LLVM IR.
+    return std::is_integral_v<T>;
+}
+
+template <typename T>
+llvm::Value * ColumnVector<T>::compileComparator(llvm::IRBuilderBase & builder, llvm::Value * lhs, llvm::Value * rhs, llvm::Value *) const
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    if constexpr (std::is_integral_v<T>)
+    {
+        // a > b ? 1 : (a < b ? -1 : 0);
+
+        bool is_signed = std::is_signed_v<T>;
+
+        auto * lhs_greater_than_rhs_result = llvm::ConstantInt::getSigned(b.getInt8Ty(), 1);
+        auto * lhs_less_than_rhs_result = llvm::ConstantInt::getSigned(b.getInt8Ty(), -1);
+        auto * lhs_equals_rhs_result = llvm::ConstantInt::getSigned(b.getInt8Ty(), 0);
+
+        auto * lhs_greater_than_rhs = is_signed ? b.CreateICmpSGT(lhs, rhs) : b.CreateICmpUGT(lhs, rhs);
+        auto * lhs_less_than_rhs = is_signed ? b.CreateICmpSLT(lhs, rhs) : b.CreateICmpULT(lhs, rhs);
+        auto * if_lhs_less_than_rhs_result = b.CreateSelect(lhs_less_than_rhs, lhs_less_than_rhs_result, lhs_equals_rhs_result);
+
+        return b.CreateSelect(lhs_greater_than_rhs, lhs_greater_than_rhs_result, if_lhs_less_than_rhs_result);
+    }
+    else
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Method compileComparator is not supported for type {}", TypeName<T>);
+    }
+}
+
+#endif
 
 template <typename T>
 void ColumnVector<T>::getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index ea9eae1881c..6ba9abaca32 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -10,6 +10,8 @@
 #include <Core/TypeId.h>
 #include <base/TypeName.h>
 
+#include "config_core.h"
+
 
 namespace DB
 {
@@ -217,6 +219,14 @@ public:
         return CompareHelper<T>::compare(data[n], assert_cast<const Self &>(rhs_).data[m], nan_direction_hint);
     }
 
+#if USE_EMBEDDED_COMPILER
+
+    bool isComparatorCompilable() const override;
+
+    llvm::Value * compileComparator(llvm::IRBuilderBase & /*builder*/, llvm::Value * /*lhs*/, llvm::Value * /*rhs*/, llvm::Value * /*nan_direction_hint*/) const override;
+
+#endif
+
     void compareColumn(const IColumn & rhs, size_t rhs_row_num,
                        PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                        int direction, int nan_direction_hint) const override
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index f4986799d47..f62f6c444b3 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -7,10 +7,19 @@
 #include <base/StringRef.h>
 #include <Core/Types.h>
 
+#include "config_core.h"
+
 
 class SipHash;
 class Collator;
 
+namespace llvm
+{
+    class LLVMContext;
+    class Value;
+    class IRBuilderBase;
+}
+
 namespace DB
 {
 
@@ -281,6 +290,17 @@ public:
       */
     [[nodiscard]] virtual int compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const = 0;
 
+#if USE_EMBEDDED_COMPILER
+
+    [[nodiscard]] virtual bool isComparatorCompilable() const { return false; }
+
+    [[nodiscard]] virtual llvm::Value * compileComparator(llvm::IRBuilderBase & /*builder*/, llvm::Value * /*lhs*/, llvm::Value * /*rhs*/, llvm::Value * /*nan_direction_hint*/) const
+    {
+        throw Exception("Method compileComparator is not supported for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
+#endif
+
     /// Equivalent to compareAt, but collator is used to compare values.
     [[nodiscard]] virtual int compareAtWithCollation(size_t, size_t, const IColumn &, int, const Collator &) const
     {
diff --git a/src/Common/HashTable/HashTableKeyHolder.h b/src/Common/HashTable/HashTableKeyHolder.h
index 41e0c01ffc6..d10ad093af6 100644
--- a/src/Common/HashTable/HashTableKeyHolder.h
+++ b/src/Common/HashTable/HashTableKeyHolder.h
@@ -14,7 +14,7 @@
   * make a persistent copy of the key in each of the following cases:
   * 1) the aggregation method doesn't use temporary keys, so they're persistent
   *    from the start;
-  * 1) the key is already present in the hash table;
+  * 2) the key is already present in the hash table;
   * 3) that particular key is stored by value, e.g. a short StringRef key in
   *    StringHashMap.
   *
diff --git a/src/Common/ObjectPool.h b/src/Common/ObjectPool.h
index ef07b8eed1b..801a37d0dfb 100644
--- a/src/Common/ObjectPool.h
+++ b/src/Common/ObjectPool.h
@@ -94,7 +94,7 @@ public:
     template <typename Factory>
     Pointer get(const Key & key, Factory && f)
     {
-        std::unique_lock lock(mutex);
+        std::lock_guard lock(mutex);
 
         auto it = container.find(key);
         if (container.end() == it)
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index 7a8cff2d58f..ffc90807060 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -165,18 +165,17 @@ void ProgressIndication::writeProgress()
     message << '\r';
 
     size_t prefix_size = message.count();
-    size_t read_bytes = progress.read_raw_bytes ? progress.read_raw_bytes : progress.read_bytes;
 
     message << indicator << " Progress: ";
     message
         << formatReadableQuantity(progress.read_rows) << " rows, "
-        << formatReadableSizeWithDecimalSuffix(read_bytes);
+        << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
 
     auto elapsed_ns = watch.elapsed();
     if (elapsed_ns)
         message << " ("
                 << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
-                << formatReadableSizeWithDecimalSuffix(read_bytes * 1000000000.0 / elapsed_ns) << "/s.) ";
+                << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.) ";
     else
         message << ". ";
 
@@ -206,7 +205,7 @@ void ProgressIndication::writeProgress()
     int64_t remaining_space = static_cast<int64_t>(terminal_width) - written_progress_chars;
 
     /// If the approximate number of rows to process is known, we can display a progress bar and percentage.
-    if (progress.total_rows_to_read || progress.total_raw_bytes_to_read)
+    if (progress.total_rows_to_read || progress.total_bytes_to_read)
     {
         size_t current_count, max_count;
         if (progress.total_rows_to_read)
@@ -216,8 +215,8 @@ void ProgressIndication::writeProgress()
         }
         else
         {
-            current_count = progress.read_raw_bytes;
-            max_count = std::max(progress.read_raw_bytes, progress.total_raw_bytes_to_read);
+            current_count = progress.read_bytes;
+            max_count = std::max(progress.read_bytes, progress.total_bytes_to_read);
         }
 
         /// To avoid flicker, display progress bar only if .5 seconds have passed since query execution start
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index ad42468de68..b5c2e7be11f 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -181,7 +181,7 @@ ThreadStatus::~ThreadStatus()
         deleter();
 
     /// Only change current_thread if it's currently being used by this ThreadStatus
-    /// For example, PushingToViewsBlockOutputStream creates and deletes ThreadStatus instances while running in the main query thread
+    /// For example, PushingToViews chain creates and deletes ThreadStatus instances while running in the main query thread
     if (current_thread == this)
         current_thread = nullptr;
 }
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 1e6239a7fa6..74b45d411b0 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -34,6 +34,12 @@ struct ACL
     int32_t permissions;
     String scheme;
     String id;
+
+    bool operator<(const ACL & other) const
+    {
+        return std::tuple(permissions, scheme, id)
+            < std::tuple(other.permissions, other.scheme, other.id);
+    }
 };
 
 using ACLs = std::vector<ACL>;
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index a661435a2eb..1481767add3 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -149,9 +149,12 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
     serializeSnapshotMetadata(snapshot.snapshot_meta, out);
     writeBinary(snapshot.session_id, out);
 
-    /// Serialize ACLs MAP
-    writeBinary(snapshot.acl_map.size(), out);
-    for (const auto & [acl_id, acls] : snapshot.acl_map)
+    /// Better to sort before serialization, otherwise snapshots can be different on different replicas
+    std::vector<std::pair<int64_t, Coordination::ACLs>> sorted_acl_map(snapshot.acl_map.begin(), snapshot.acl_map.end());
+    std::sort(sorted_acl_map.begin(), sorted_acl_map.end());
+    /// Serialize ACLs map
+    writeBinary(sorted_acl_map.size(), out);
+    for (const auto & [acl_id, acls] : sorted_acl_map)
     {
         writeBinary(acl_id, out);
         writeBinary(acls.size(), out);
@@ -187,10 +190,16 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
         ++it;
     }
 
+    /// Session must be saved in a sorted order,
+    /// otherwise snapshots will be different
+    std::vector<std::pair<int64_t, int64_t>> sorted_session_and_timeout(snapshot.session_and_timeout.begin(), snapshot.session_and_timeout.end());
+    std::sort(sorted_session_and_timeout.begin(), sorted_session_and_timeout.end());
+
     /// Serialize sessions
-    size_t size = snapshot.session_and_timeout.size();
+    size_t size = sorted_session_and_timeout.size();
+
     writeBinary(size, out);
-    for (const auto & [session_id, timeout] : snapshot.session_and_timeout)
+    for (const auto & [session_id, timeout] : sorted_session_and_timeout)
     {
         writeBinary(session_id, out);
         writeBinary(timeout, out);
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index d2545550c4f..cf4d1eaf9f2 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -24,6 +24,7 @@
 #include <Coordination/KeeperLogStore.h>
 #include <Coordination/Changelog.h>
 #include <filesystem>
+#include <Common/SipHash.h>
 
 #include <Coordination/SnapshotableHashTable.h>
 
@@ -1709,6 +1710,46 @@ TEST_P(CoordinationTest, ChangelogInsertThreeTimesHard)
     EXPECT_EQ(changelog4.next_slot(), 5);
 }
 
+TEST_P(CoordinationTest, TestStorageSnapshotEqual)
+{
+    auto params = GetParam();
+    ChangelogDirTest test("./snapshots");
+    std::optional<UInt128> snapshot_hash;
+    for (size_t i = 0; i < 15; ++i)
+    {
+        DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+
+        DB::KeeperStorage storage(500, "");
+        for (size_t j = 0; j < 5000; ++j)
+        {
+            addNode(storage, "/hello_" + std::to_string(j), "world", 1);
+            addNode(storage, "/hello/somepath_" + std::to_string(j), "somedata", 3);
+        }
+
+        storage.session_id_counter = 5;
+
+        storage.ephemerals[3] = {"/hello"};
+        storage.ephemerals[1] = {"/hello/somepath"};
+
+        for (size_t j = 0; j < 3333; ++j)
+            storage.getSessionID(130 * j);
+
+        DB::KeeperStorageSnapshot snapshot(&storage, storage.zxid);
+
+        auto buf = manager.serializeSnapshotToBuffer(snapshot);
+
+        auto new_hash = sipHash128(reinterpret_cast<char *>(buf->data()), buf->size());
+        if (!snapshot_hash.has_value())
+        {
+            snapshot_hash = new_hash;
+        }
+        else
+        {
+            EXPECT_EQ(*snapshot_hash, new_hash);
+        }
+    }
+}
+
 
 TEST_P(CoordinationTest, TestLogGap)
 {
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index f5764262c66..a21c96abfdb 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -498,6 +498,15 @@ Block Block::cloneWithColumns(MutableColumns && columns) const
     Block res;
 
     size_t num_columns = data.size();
+
+    if (num_columns != columns.size())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot clone block with columns because block has {} columns, but {} columns given",
+            num_columns, columns.size());
+    }
+
     res.reserve(num_columns);
 
     for (size_t i = 0; i < num_columns; ++i)
@@ -514,8 +523,12 @@ Block Block::cloneWithColumns(const Columns & columns) const
     size_t num_columns = data.size();
 
     if (num_columns != columns.size())
-        throw Exception("Cannot clone block with columns because block has " + toString(num_columns) + " columns, "
-                        "but " + toString(columns.size()) + " columns given.", ErrorCodes::LOGICAL_ERROR);
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot clone block with columns because block has {} columns, but {} columns given",
+            num_columns, columns.size());
+    }
 
     res.reserve(num_columns);
 
diff --git a/src/Core/BlockInfo.h b/src/Core/BlockInfo.h
index 4e06edc65be..82d790bbc8e 100644
--- a/src/Core/BlockInfo.h
+++ b/src/Core/BlockInfo.h
@@ -46,7 +46,7 @@ struct BlockInfo
     void read(ReadBuffer & in);
 };
 
-/// Block extension to support delayed defaults. AddingDefaultsBlockInputStream uses it to replace missing values with column defaults.
+/// Block extension to support delayed defaults. AddingDefaultsTransform uses it to replace missing values with column defaults.
 class BlockMissingValues
 {
 public:
diff --git a/src/Core/ColumnNumbers.h b/src/Core/ColumnNumbers.h
index 9441f6485a7..29b4c49dc83 100644
--- a/src/Core/ColumnNumbers.h
+++ b/src/Core/ColumnNumbers.h
@@ -8,5 +8,6 @@ namespace DB
 {
 
 using ColumnNumbers = std::vector<size_t>;
+using ColumnNumbersList = std::vector<ColumnNumbers>;
 
 }
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index 3ac9ad2fa02..2719017a726 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -109,6 +109,8 @@ public:
     std::optional<NameAndTypePair> tryGetByName(const std::string & name) const;
 };
 
+using NamesAndTypesLists = std::vector<NamesAndTypesList>;
+
 }
 
 namespace std
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index be73465eea0..6e5f707ded2 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -22,6 +22,10 @@ namespace DB
 {
 class IColumn;
 
+static constexpr UInt64 operator""_Gb(unsigned long long value)
+{
+    return value * 1024 * 1024 * 1024;
+}
 
 /** List of settings: type, name, default value, description, flags
   *
@@ -116,6 +120,8 @@ class IColumn;
     M(UInt64, min_count_to_compile_expression, 3, "The number of identical expressions before they are JIT-compiled", 0) \
     M(Bool, compile_aggregate_expressions, true, "Compile aggregate functions to native code.", 0) \
     M(UInt64, min_count_to_compile_aggregate_expression, 3, "The number of identical aggregate expressions before they are JIT-compiled", 0) \
+    M(Bool, compile_sort_description, true, "Compile sort description to native code.", 0) \
+    M(UInt64, min_count_to_compile_sort_description, 3, "The number of identical sort descriptions before they are JIT-compiled", 0) \
     M(UInt64, group_by_two_level_threshold, 100000, "From what number of keys, a two-level aggregation starts. 0 - the threshold is not set.", 0) \
     M(UInt64, group_by_two_level_threshold_bytes, 50000000, "From what size of the aggregation state in bytes, a two-level aggregation begins to be used. 0 - the threshold is not set. Two-level aggregation is used when at least one of the thresholds is triggered.", 0) \
     M(Bool, distributed_aggregation_memory_efficient, true, "Is the memory-saving mode of distributed aggregation enabled.", 0) \
@@ -356,9 +362,9 @@ class IColumn;
     M(OverflowMode, distinct_overflow_mode, OverflowMode::THROW, "What to do when the limit is exceeded.", 0) \
     \
     M(UInt64, max_memory_usage, 0, "Maximum memory usage for processing of single query. Zero means unlimited.", 0) \
-    M(UInt64, max_guaranteed_memory_usage, 0, "Maximum guaranteed memory usage for processing of single query. It represents soft limit. Zero means unlimited.", 0) \
+    M(UInt64, max_guaranteed_memory_usage, 10_Gb, "Maximum guaranteed memory usage for processing of single query. It represents soft limit. Zero means unlimited.", 0) \
     M(UInt64, max_memory_usage_for_user, 0, "Maximum memory usage for processing all concurrently running queries for the user. Zero means unlimited.", 0) \
-    M(UInt64, max_guaranteed_memory_usage_for_user, 0, "Maximum guaranteed memory usage for processing all concurrently running queries for the user. It represents soft limit. Zero means unlimited.", 0) \
+    M(UInt64, max_guaranteed_memory_usage_for_user, 10_Gb, "Maximum guaranteed memory usage for processing all concurrently running queries for the user. It represents soft limit. Zero means unlimited.", 0) \
     M(UInt64, max_untracked_memory, (4 * 1024 * 1024), "Small allocations and deallocations are grouped in thread local variable and tracked or profiled only when amount (in absolute value) becomes larger than specified value. If the value is higher than 'memory_profiler_step' it will be effectively lowered to 'memory_profiler_step'.", 0) \
     M(UInt64, memory_profiler_step, (4 * 1024 * 1024), "Whenever query memory usage becomes larger than every next step in number of bytes the memory profiler will collect the allocating stack trace. Zero means disabled memory profiler. Values lower than a few megabytes will slow down query processing.", 0) \
     M(Float, memory_profiler_sample_probability, 0., "Collect random allocations and deallocations and write them into system.trace_log with 'MemorySample' trace_type. The probability is for every alloc/free regardless to the size of the allocation. Note that sampling happens only when the amount of untracked memory exceeds 'max_untracked_memory'. You may want to set 'max_untracked_memory' to 0 for extra fine grained sampling.", 0) \
@@ -375,7 +381,7 @@ class IColumn;
     \
     M(Bool, log_profile_events, true, "Log query performance statistics into the query_log, query_thread_log and query_views_log.", 0) \
     M(Bool, log_query_settings, true, "Log query settings into the query_log.", 0) \
-    M(Bool, log_query_threads, true, "Log query threads into system.query_thread_log table. This setting have effect only when 'log_queries' is true.", 0) \
+    M(Bool, log_query_threads, false, "Log query threads into system.query_thread_log table. This setting have effect only when 'log_queries' is true.", 0) \
     M(Bool, log_query_views, true, "Log query dependent views into system.query_views_log table. This setting have effect only when 'log_queries' is true.", 0) \
     M(String, log_comment, "", "Log comment into system.query_log table and server log. It can be set to arbitrary string no longer than max_query_size.", 0) \
     M(LogsLevel, send_logs_level, LogsLevel::fatal, "Send server text logs with specified minimum level to client. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
@@ -722,7 +728,7 @@ class IColumn;
     M(Bool, output_format_pretty_row_numbers, false, "Add row numbers before each row for pretty output format", 0) \
     M(Bool, insert_distributed_one_random_shard, false, "If setting is enabled, inserting into distributed table will choose a random shard to write when there is no sharding key", 0) \
     \
-    M(Bool, cross_to_inner_join_rewrite, true, "Use inner join instead of comma/cross join if possible", 0) \
+    M(UInt64, cross_to_inner_join_rewrite, 1, "Use inner join instead of comma/cross join if possible. Possible values: 0 - no rewrite, 1 - apply if possible, 2 - force rewrite all cross joins", 0) \
     \
     M(Bool, output_format_arrow_low_cardinality_as_dictionary, false, "Enable output LowCardinality type as Dictionary Arrow type", 0) \
     \
diff --git a/src/Core/SortCursor.h b/src/Core/SortCursor.h
index a0f60fbccf8..584556045e8 100644
--- a/src/Core/SortCursor.h
+++ b/src/Core/SortCursor.h
@@ -12,6 +12,11 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnString.h>
 
+#include "config_core.h"
+
+#if USE_EMBEDDED_COMPILER
+#include <Interpreters/JIT/compileFunction.h>
+#endif
 
 namespace DB
 {
@@ -49,6 +54,10 @@ struct SortCursorImpl
       */
     IColumn::Permutation * permutation = nullptr;
 
+#if USE_EMBEDDED_COMPILER
+    std::vector<ColumnData> raw_sort_columns_data;
+#endif
+
     SortCursorImpl() = default;
 
     SortCursorImpl(const Block & block, const SortDescription & desc_, size_t order_ = 0, IColumn::Permutation * perm = nullptr)
@@ -78,6 +87,9 @@ struct SortCursorImpl
     {
         all_columns.clear();
         sort_columns.clear();
+#if USE_EMBEDDED_COMPILER
+        raw_sort_columns_data.clear();
+#endif
 
         size_t num_columns = columns.size();
 
@@ -90,6 +102,10 @@ struct SortCursorImpl
             size_t column_number = block.getPositionByName(column_desc.column_name);
             sort_columns.push_back(columns[column_number].get());
 
+#if USE_EMBEDDED_COMPILER
+            if (desc.compiled_sort_description)
+                raw_sort_columns_data.emplace_back(getColumnData(sort_columns.back()));
+#endif
             need_collation[j] = desc[j].collator != nullptr && sort_columns.back()->isCollationSupported();
             has_collation |= need_collation[j];
         }
@@ -164,17 +180,36 @@ struct SortCursor : SortCursorHelper<SortCursor>
     /// The specified row of this cursor is greater than the specified row of another cursor.
     bool ALWAYS_INLINE greaterAt(const SortCursor & rhs, size_t lhs_pos, size_t rhs_pos) const
     {
+#if USE_EMBEDDED_COMPILER
+        if (impl->desc.compiled_sort_description && rhs.impl->desc.compiled_sort_description)
+        {
+            assert(impl->raw_sort_columns_data.size() == rhs.impl->raw_sort_columns_data.size());
+
+            auto sort_description_func_typed = reinterpret_cast<JITSortDescriptionFunc>(impl->desc.compiled_sort_description);
+            int res = sort_description_func_typed(lhs_pos, rhs_pos, impl->raw_sort_columns_data.data(), rhs.impl->raw_sort_columns_data.data()); /// NOLINT
+
+            if (res > 0)
+                return true;
+            if (res < 0)
+                return false;
+
+            return impl->order > rhs.impl->order;
+        }
+#endif
+
         for (size_t i = 0; i < impl->sort_columns_size; ++i)
         {
             const auto & desc = impl->desc[i];
             int direction = desc.direction;
             int nulls_direction = desc.nulls_direction;
             int res = direction * impl->sort_columns[i]->compareAt(lhs_pos, rhs_pos, *(rhs.impl->sort_columns[i]), nulls_direction);
+
             if (res > 0)
                 return true;
             if (res < 0)
                 return false;
         }
+
         return impl->order > rhs.impl->order;
     }
 };
@@ -190,8 +225,26 @@ struct SimpleSortCursor : SortCursorHelper<SimpleSortCursor>
         const auto & desc = impl->desc[0];
         int direction = desc.direction;
         int nulls_direction = desc.nulls_direction;
-        int res = impl->sort_columns[0]->compareAt(lhs_pos, rhs_pos, *(rhs.impl->sort_columns[0]), nulls_direction);
-        return res != 0 && ((res > 0) == (direction > 0));
+
+        bool result = false;
+
+#if USE_EMBEDDED_COMPILER
+        if (impl->desc.compiled_sort_description && rhs.impl->desc.compiled_sort_description)
+        {
+            assert(impl->raw_sort_columns_data.size() == rhs.impl->raw_sort_columns_data.size());
+
+            auto sort_description_func_typed = reinterpret_cast<JITSortDescriptionFunc>(impl->desc.compiled_sort_description);
+            int jit_result = sort_description_func_typed(lhs_pos, rhs_pos, impl->raw_sort_columns_data.data(), rhs.impl->raw_sort_columns_data.data()); /// NOLINT
+            result = jit_result > 0;
+        }
+        else
+#endif
+        {
+            int non_jit_result = impl->sort_columns[0]->compareAt(lhs_pos, rhs_pos, *(rhs.impl->sort_columns[0]), nulls_direction);
+            result = (non_jit_result != 0 && ((non_jit_result > 0) == (direction > 0)));
+        }
+
+        return result;
     }
 };
 
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index 7994ada7b85..e7fa6816807 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -2,6 +2,13 @@
 #include <Core/SortDescription.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
+#include <Common/SipHash.h>
+
+#if USE_EMBEDDED_COMPILER
+#include <DataTypes/Native.h>
+#include <Interpreters/JIT/compileFunction.h>
+#include <Interpreters/JIT/CompiledExpressionCache.h>
+#endif
 
 namespace DB
 {
@@ -35,6 +42,115 @@ void SortColumnDescription::explain(JSONBuilder::JSONMap & map) const
     map.add("With Fill", with_fill);
 }
 
+#if USE_EMBEDDED_COMPILER
+
+static CHJIT & getJITInstance()
+{
+    static CHJIT jit;
+    return jit;
+}
+
+class CompiledSortDescriptionFunctionHolder final : public CompiledExpressionCacheEntry
+{
+public:
+    explicit CompiledSortDescriptionFunctionHolder(CompiledSortDescriptionFunction compiled_function_)
+        : CompiledExpressionCacheEntry(compiled_function_.compiled_module.size)
+        , compiled_sort_description_function(compiled_function_)
+    {}
+
+    ~CompiledSortDescriptionFunctionHolder() override
+    {
+        getJITInstance().deleteCompiledModule(compiled_sort_description_function.compiled_module);
+    }
+
+    CompiledSortDescriptionFunction compiled_sort_description_function;
+};
+
+static std::string getSortDescriptionDump(const SortDescription & description, const DataTypes & header_types)
+{
+    WriteBufferFromOwnString buffer;
+
+    for (size_t i = 0; i < description.size(); ++i)
+        buffer << header_types[i]->getName() << ' ' << description[i].direction << ' ' << description[i].nulls_direction;
+
+    return buffer.str();
+}
+
+static Poco::Logger * getLogger()
+{
+    static Poco::Logger & logger = Poco::Logger::get("SortDescription");
+    return &logger;
+}
+
+void compileSortDescriptionIfNeeded(SortDescription & description, const DataTypes & sort_description_types, bool increase_compile_attemps)
+{
+    static std::unordered_map<UInt128, UInt64, UInt128Hash> counter;
+    static std::mutex mutex;
+
+    if (!description.compile_sort_description || sort_description_types.empty())
+        return;
+
+    for (const auto & type : sort_description_types)
+    {
+        if (!type->createColumn()->isComparatorCompilable() || !canBeNativeType(*type))
+            return;
+    }
+
+    auto description_dump = getSortDescriptionDump(description, sort_description_types);
+
+    SipHash sort_description_dump_hash;
+    sort_description_dump_hash.update(description_dump);
+
+    UInt128 sort_description_hash_key;
+    sort_description_dump_hash.get128(sort_description_hash_key);
+
+    {
+        std::lock_guard lock(mutex);
+        UInt64 & current_counter = counter[sort_description_hash_key];
+        if (current_counter < description.min_count_to_compile_sort_description)
+        {
+            current_counter += static_cast<UInt64>(increase_compile_attemps);
+            return;
+        }
+    }
+
+    std::shared_ptr<CompiledSortDescriptionFunctionHolder> compiled_sort_description_holder;
+
+    if (auto * compilation_cache = CompiledExpressionCacheFactory::instance().tryGetCache())
+    {
+        auto [compiled_function_cache_entry, _] = compilation_cache->getOrSet(sort_description_hash_key, [&] ()
+        {
+            LOG_TRACE(getLogger(), "Compile sort description {}", description_dump);
+
+            auto compiled_sort_description = compileSortDescription(getJITInstance(), description, sort_description_types, description_dump);
+            return std::make_shared<CompiledSortDescriptionFunctionHolder>(std::move(compiled_sort_description));
+        });
+
+        compiled_sort_description_holder = std::static_pointer_cast<CompiledSortDescriptionFunctionHolder>(compiled_function_cache_entry);
+    }
+    else
+    {
+        LOG_TRACE(getLogger(), "Compile sort description {}", description_dump);
+        auto compiled_sort_description = compileSortDescription(getJITInstance(), description, sort_description_types, description_dump);
+        compiled_sort_description_holder = std::make_shared<CompiledSortDescriptionFunctionHolder>(std::move(compiled_sort_description));
+    }
+
+    auto comparator_function = compiled_sort_description_holder->compiled_sort_description_function.comparator_function;
+    description.compiled_sort_description = reinterpret_cast<void *>(comparator_function);
+    description.compiled_sort_description_holder = std::move(compiled_sort_description_holder);
+}
+
+#else
+
+void compileSortDescriptionIfNeeded(SortDescription & description, const DataTypes & sort_description_types, bool increase_compile_attemps)
+{
+    (void)(description);
+    (void)(sort_description_types);
+    (void)(increase_compile_attemps);
+}
+
+#endif
+
 std::string dumpSortDescription(const SortDescription & description)
 {
     WriteBufferFromOwnString wb;
diff --git a/src/Core/SortDescription.h b/src/Core/SortDescription.h
index b86706e665a..3d4e3b665ee 100644
--- a/src/Core/SortDescription.h
+++ b/src/Core/SortDescription.h
@@ -89,10 +89,26 @@ struct SortColumnDescriptionWithColumnIndex
     }
 };
 
+class CompiledSortDescriptionFunctionHolder;
+
 /// Description of the sorting rule for several columns.
-using SortDescription = std::vector<SortColumnDescription>;
 using SortDescriptionWithPositions = std::vector<SortColumnDescriptionWithColumnIndex>;
 
+class SortDescription : public std::vector<SortColumnDescription>
+{
+public:
+    /// Can be safely casted into JITSortDescriptionFunc
+    void * compiled_sort_description = nullptr;
+    std::shared_ptr<CompiledSortDescriptionFunctionHolder> compiled_sort_description_holder;
+    size_t min_count_to_compile_sort_description = 3;
+    bool compile_sort_description = false;
+};
+
+/** Compile sort description for header_types.
+  * Description is compiled only if compilation attempts to compile identical description is more than min_count_to_compile_sort_description.
+  */
+void compileSortDescriptionIfNeeded(SortDescription & description, const DataTypes & sort_description_types, bool increase_compile_attemps);
+
 /// Outputs user-readable description into `out`.
 void dumpSortDescription(const SortDescription & description, WriteBuffer & out);
 
diff --git a/src/DataTypes/Native.h b/src/DataTypes/Native.h
index 3a635d2e240..1950b1407df 100644
--- a/src/DataTypes/Native.h
+++ b/src/DataTypes/Native.h
@@ -47,7 +47,7 @@ static inline llvm::Type * toNativeType(llvm::IRBuilderBase & builder, const IDa
         return builder.getInt8Ty();
     else if (data_type.isInt16() || data_type.isUInt16() || data_type.isDate())
         return builder.getInt16Ty();
-    else if (data_type.isInt32() || data_type.isUInt32() || data_type.isDateTime())
+    else if (data_type.isInt32() || data_type.isUInt32() || data_type.isDate32() || data_type.isDateTime())
         return builder.getInt32Ty();
     else if (data_type.isInt64() || data_type.isUInt64())
         return builder.getInt64Ty();
@@ -111,7 +111,8 @@ static inline bool canBeNativeType(const IDataType & type)
         return canBeNativeType(*data_type_nullable.getNestedType());
     }
 
-    return data_type.isNativeInt() || data_type.isNativeUInt() || data_type.isFloat() || data_type.isDate() || data_type.isEnum();
+    return data_type.isNativeInt() || data_type.isNativeUInt() || data_type.isFloat() || data_type.isDate()
+        || data_type.isDate32() || data_type.isDateTime() || data_type.isEnum();
 }
 
 static inline llvm::Type * toNativeType(llvm::IRBuilderBase & builder, const DataTypePtr & type)
@@ -264,11 +265,11 @@ static inline llvm::Constant * getColumnNativeValue(llvm::IRBuilderBase & builde
     {
         return llvm::ConstantFP::get(type, assert_cast<const ColumnVector<Float64> &>(column).getElement(index));
     }
-    else if (column_data_type.isNativeUInt() || column_data_type.isDate() || column_data_type.isDateTime() || column_data_type.isDateTime64())
+    else if (column_data_type.isNativeUInt() || column_data_type.isDate() || column_data_type.isDateTime())
     {
         return llvm::ConstantInt::get(type, column.getUInt(index));
     }
-    else if (column_data_type.isNativeInt() || column_data_type.isEnum())
+    else if (column_data_type.isNativeInt() || column_data_type.isEnum() || column_data_type.isDate32())
     {
         return llvm::ConstantInt::get(type, column.getInt(index));
     }
diff --git a/src/DataTypes/Serializations/SerializationNullable.h b/src/DataTypes/Serializations/SerializationNullable.h
index c22f2f57786..e6e0e4f33c2 100644
--- a/src/DataTypes/Serializations/SerializationNullable.h
+++ b/src/DataTypes/Serializations/SerializationNullable.h
@@ -60,7 +60,7 @@ public:
       * 1. \N
       * 2. empty string (without quotes)
       * 3. NULL
-      * We support all of them (however, second variant is supported by CSVRowInputStream, not by deserializeTextCSV).
+      * We support all of them (however, second variant is supported by CSVRowInputFormat, not by deserializeTextCSV).
       * (see also input_format_defaults_for_omitted_fields and input_format_csv_unquoted_null_literal_as_null settings)
       * In CSV, non-NULL string value, starting with \N characters, must be placed in quotes, to avoid ambiguity.
       */
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 43e8b6316a4..96b4e273ce7 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -104,15 +104,17 @@ bool DatabaseReplicatedDDLWorker::waitForReplicaToProcessAllEntries(UInt64 timeo
     auto max_log =  DDLTask::getLogEntryName(max_log_ptr);
     LOG_TRACE(log, "Waiting for worker thread to process all entries before {}, current task is {}", max_log, current_task);
 
-    std::unique_lock lock{mutex};
-    bool processed = wait_current_task_change.wait_for(lock, std::chrono::milliseconds(timeout_ms), [&]()
     {
-        assert(zookeeper->expired() || current_task <= max_log);
-        return zookeeper->expired() || current_task == max_log || stop_flag;
-    });
+        std::unique_lock lock{mutex};
+        bool processed = wait_current_task_change.wait_for(lock, std::chrono::milliseconds(timeout_ms), [&]()
+        {
+            assert(zookeeper->expired() || current_task <= max_log);
+            return zookeeper->expired() || current_task == max_log || stop_flag;
+        });
 
-    if (!processed)
-        return false;
+        if (!processed)
+            return false;
+    }
 
     LOG_TRACE(log, "Waiting for worker thread to process all entries before {}, current task is {}", max_log, current_task);
 
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index 3f1cc07c3cd..355920bbf50 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -217,7 +217,7 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re
     }
     else
     {
-        /// We pass empty block to RemoteBlockInputStream, because we don't know the structure of the result.
+        /// We pass empty block to RemoteQueryExecutor, because we don't know the structure of the result.
         Block invalidate_sample_block;
         QueryPipeline pipeline(std::make_shared<RemoteSource>(
             std::make_shared<RemoteQueryExecutor>(pool, request, invalidate_sample_block, context_copy), false, false));
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 9a65d916022..f15e44a6e21 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -67,7 +67,7 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
     size_t dictionary_keys_size = dict_struct.getKeysNames().size();
     block_key_columns.reserve(dictionary_keys_size);
 
-    QueryPipeline pipeline(getSourceBlockInputStream(key_columns, requested_keys));
+    QueryPipeline pipeline(getSourcePipe(key_columns, requested_keys));
 
     PullingPipelineExecutor executor(pipeline);
 
@@ -185,7 +185,7 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
     size_t dictionary_keys_size = dict_struct.getKeysNames().size();
     block_key_columns.reserve(dictionary_keys_size);
 
-    QueryPipeline pipeline(getSourceBlockInputStream(key_columns, requested_keys));
+    QueryPipeline pipeline(getSourcePipe(key_columns, requested_keys));
     PullingPipelineExecutor executor(pipeline);
 
     size_t keys_found = 0;
@@ -259,7 +259,7 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::isInHierarchy(
 }
 
 template <DictionaryKeyType dictionary_key_type>
-Pipe DirectDictionary<dictionary_key_type>::getSourceBlockInputStream(
+Pipe DirectDictionary<dictionary_key_type>::getSourcePipe(
     const Columns & key_columns [[maybe_unused]],
     const PaddedPODArray<KeyType> & requested_keys [[maybe_unused]]) const
 {
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index de18e9486e6..2b5662b8c1a 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -96,7 +96,7 @@ public:
     Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
 private:
-    Pipe getSourceBlockInputStream(const Columns & key_columns, const PaddedPODArray<KeyType> & requested_keys) const;
+    Pipe getSourcePipe(const Columns & key_columns, const PaddedPODArray<KeyType> & requested_keys) const;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 28aab8ed982..46cba702b5d 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -697,7 +697,6 @@ void IPAddressDictionary::getItemsImpl(
     const auto & first_column = key_columns.front();
     const size_t rows = first_column->size();
 
-    // special case for getBlockInputStream
     if (unlikely(key_columns.size() == 2))
     {
         getItemsByTwoKeyColumnsImpl<AttributeType>(
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
index d1e4b9fa21e..8ac576be61c 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
@@ -1,10 +1,10 @@
 #include "AsynchronousReadIndirectBufferFromRemoteFS.h"
 
 #include <Common/Stopwatch.h>
+#include <Common/logger_useful.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <IO/ReadSettings.h>
-#include <Common/logger_useful.h>
 
 
 namespace CurrentMetrics
@@ -57,7 +57,6 @@ AsynchronousReadIndirectBufferFromRemoteFS::AsynchronousReadIndirectBufferFromRe
     ProfileEvents::increment(ProfileEvents::RemoteFSBuffers);
 }
 
-
 String AsynchronousReadIndirectBufferFromRemoteFS::getFileName() const
 {
     return impl->getFileName();
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
index 7ffac5cd08e..d5ff0e3b50a 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
@@ -23,18 +23,12 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-static String getQueryId()
-{
-    if (!CurrentThread::isInitialized() || !CurrentThread::get().getQueryContext() || CurrentThread::getQueryId().size == 0)
-        return "";
-    return CurrentThread::getQueryId().toString();
-}
-
 CachedReadBufferFromRemoteFS::CachedReadBufferFromRemoteFS(
     const String & remote_fs_object_path_,
     FileCachePtr cache_,
     RemoteFSFileReaderCreator remote_file_reader_creator_,
     const ReadSettings & settings_,
+    const String & query_id_,
     size_t read_until_position_)
     : SeekableReadBuffer(nullptr, 0)
 #ifndef NDEBUG
@@ -48,8 +42,8 @@ CachedReadBufferFromRemoteFS::CachedReadBufferFromRemoteFS(
     , settings(settings_)
     , read_until_position(read_until_position_)
     , remote_file_reader_creator(remote_file_reader_creator_)
-    , query_id(getQueryId())
-    , enable_logging(!query_id.empty() && CurrentThread::get().getQueryContext()->getSettingsRef().enable_filesystem_cache_log)
+    , query_id(query_id_)
+    , enable_logging(!query_id.empty() && settings_.enable_filesystem_cache_log)
 {
 }
 
@@ -63,6 +57,7 @@ void CachedReadBufferFromRemoteFS::appendFilesystemCacheLog(
         .source_file_path = remote_fs_object_path,
         .file_segment_range = { file_segment_range.left, file_segment_range.right },
         .file_segment_size = file_segment_range.size(),
+        .cache_attempted = true,
     };
 
     switch (type)
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.h b/src/Disks/IO/CachedReadBufferFromRemoteFS.h
index 62bb070b437..da270a1fdae 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.h
+++ b/src/Disks/IO/CachedReadBufferFromRemoteFS.h
@@ -26,6 +26,7 @@ public:
         FileCachePtr cache_,
         RemoteFSFileReaderCreator remote_file_reader_creator_,
         const ReadSettings & settings_,
+        const String & query_id_,
         size_t read_until_position_);
 
     bool nextImpl() override;
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index 4399befa433..57b72d0190d 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -21,9 +21,11 @@
 #include <filesystem>
 #include <iostream>
 #include <Common/hex.h>
+#include <Interpreters/FilesystemCacheLog.h>
 
 namespace fs = std::filesystem;
 
+
 namespace DB
 {
 
@@ -32,17 +34,24 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-#if USE_AWS_S3
-SeekableReadBufferPtr ReadBufferFromS3Gather::createImplementationBuffer(const String & path, size_t file_size)
+SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(const String & path, size_t file_size)
+{
+    if (!current_file_path.empty() && !with_cache && enable_cache_log)
+    {
+        appendFilesystemCacheLog();
+    }
+
+    current_file_path = fs::path(common_path_prefix) / path;
+    current_file_size = file_size;
+    total_bytes_read_from_current_file = 0;
+
+    return createImplementationBufferImpl(path, file_size);
+}
+
+#if USE_AWS_S3
+SeekableReadBufferPtr ReadBufferFromS3Gather::createImplementationBufferImpl(const String & path, size_t file_size)
 {
-    current_path = path;
     auto remote_path = fs::path(common_path_prefix) / path;
-
-    auto cache = settings.remote_fs_cache;
-    bool with_cache = cache
-        && settings.enable_filesystem_cache
-        && (!IFileCache::isReadOnly() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache);
-
     auto remote_file_reader_creator = [=, this]()
     {
         return std::make_unique<ReadBufferFromS3>(
@@ -53,7 +62,7 @@ SeekableReadBufferPtr ReadBufferFromS3Gather::createImplementationBuffer(const S
     if (with_cache)
     {
         return std::make_shared<CachedReadBufferFromRemoteFS>(
-            remote_path, cache, remote_file_reader_creator, settings, read_until_position ? read_until_position : file_size);
+            remote_path, settings.remote_fs_cache, remote_file_reader_creator, settings, query_id, read_until_position ? read_until_position : file_size);
     }
 
     return remote_file_reader_creator();
@@ -62,24 +71,24 @@ SeekableReadBufferPtr ReadBufferFromS3Gather::createImplementationBuffer(const S
 
 
 #if USE_AZURE_BLOB_STORAGE
-SeekableReadBufferPtr ReadBufferFromAzureBlobStorageGather::createImplementationBuffer(const String & path, size_t /* file_size */)
+SeekableReadBufferPtr ReadBufferFromAzureBlobStorageGather::createImplementationBufferImpl(const String & path, size_t /* file_size */)
 {
-    current_path = path;
+    current_file_path = path;
     return std::make_unique<ReadBufferFromAzureBlobStorage>(blob_container_client, path, max_single_read_retries,
         max_single_download_retries, settings.remote_fs_buffer_size, /* use_external_buffer */true, read_until_position);
 }
 #endif
 
 
-SeekableReadBufferPtr ReadBufferFromWebServerGather::createImplementationBuffer(const String & path, size_t /* file_size */)
+SeekableReadBufferPtr ReadBufferFromWebServerGather::createImplementationBufferImpl(const String & path, size_t /* file_size */)
 {
-    current_path = path;
+    current_file_path = path;
     return std::make_unique<ReadBufferFromWebServer>(fs::path(uri) / path, context, settings, /* use_external_buffer */true, read_until_position);
 }
 
 
 #if USE_HDFS
-SeekableReadBufferPtr ReadBufferFromHDFSGather::createImplementationBuffer(const String & path, size_t /* file_size */)
+SeekableReadBufferPtr ReadBufferFromHDFSGather::createImplementationBufferImpl(const String & path, size_t /* file_size */)
 {
     return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, fs::path(hdfs_directory) / path, config, settings.remote_fs_buffer_size);
 }
@@ -94,8 +103,31 @@ ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
     , common_path_prefix(common_path_prefix_)
     , blobs_to_read(blobs_to_read_)
     , settings(settings_)
+    , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr ? CurrentThread::getQueryId() : "")
     , log(&Poco::Logger::get("ReadBufferFromRemoteFSGather"))
+    , enable_cache_log(!query_id.empty() && settings.enable_filesystem_cache_log)
 {
+    with_cache = settings.remote_fs_cache
+        && settings.enable_filesystem_cache
+        && (!IFileCache::isReadOnly() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache);
+}
+
+
+void ReadBufferFromRemoteFSGather::appendFilesystemCacheLog()
+{
+    FilesystemCacheLogElement elem
+    {
+        .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
+        .query_id = query_id,
+        .source_file_path = current_file_path,
+        .file_segment_range = { 0, current_file_size },
+        .read_type = FilesystemCacheLogElement::ReadType::READ_FROM_FS_BYPASSING_CACHE,
+        .file_segment_size = total_bytes_read_from_current_file,
+        .cache_attempted = false,
+    };
+
+    if (auto cache_log = Context::getGlobalContextInstance()->getFilesystemCacheLog())
+        cache_log->add(elem);
 }
 
 
@@ -199,6 +231,7 @@ bool ReadBufferFromRemoteFSGather::readImpl()
      */
     if (bytes_to_ignore)
     {
+        total_bytes_read_from_current_file += bytes_to_ignore;
         current_buf->ignore(bytes_to_ignore);
         result = current_buf->hasPendingData();
         file_offset_of_buffer_end += bytes_to_ignore;
@@ -225,6 +258,7 @@ bool ReadBufferFromRemoteFSGather::readImpl()
     {
         assert(available());
         nextimpl_working_buffer_offset = offset();
+        total_bytes_read_from_current_file += available();
     }
 
     return result;
@@ -254,7 +288,7 @@ void ReadBufferFromRemoteFSGather::reset()
 
 String ReadBufferFromRemoteFSGather::getFileName() const
 {
-    return current_path;
+    return current_file_path;
 }
 
 
@@ -282,5 +316,12 @@ size_t ReadBufferFromRemoteFSGather::getImplementationBufferOffset() const
     return current_buf->getFileOffsetOfBufferEnd();
 }
 
+ReadBufferFromRemoteFSGather::~ReadBufferFromRemoteFSGather()
+{
+    if (!with_cache && enable_cache_log)
+    {
+        appendFilesystemCacheLog();
+    }
+}
 
 }
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index da2d1dee4b2..d6f12b2f45e 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -29,6 +29,9 @@ public:
         const std::string & common_path_prefix_,
         const BlobsPathToSize & blobs_to_read_,
         const ReadSettings & settings_);
+
+    ~ReadBufferFromRemoteFSGather() override;
+
     String getFileName() const;
 
     void reset();
@@ -54,7 +57,7 @@ public:
     size_t getImplementationBufferOffset() const;
 
 protected:
-    virtual SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size) = 0;
+    virtual SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) = 0;
 
     std::string common_path_prefix;
 
@@ -64,9 +67,16 @@ protected:
 
     size_t read_until_position = 0;
 
-    String current_path;
+    String current_file_path;
+    size_t current_file_size = 0;
+
+    bool with_cache;
+
+    String query_id;
 
 private:
+    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size);
+
     bool nextImpl() override;
 
     void initialize();
@@ -75,6 +85,8 @@ private:
 
     bool moveToNextBuffer();
 
+    void appendFilesystemCacheLog();
+
     SeekableReadBufferPtr current_buf;
 
     size_t current_buf_idx = 0;
@@ -89,6 +101,10 @@ private:
     size_t bytes_to_ignore = 0;
 
     Poco::Logger * log;
+
+    size_t total_bytes_read_from_current_file = 0;
+
+    bool enable_cache_log = false;
 };
 
 
@@ -113,7 +129,7 @@ public:
     {
     }
 
-    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size) override;
+    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
 
 private:
     std::shared_ptr<Aws::S3::S3Client> client_ptr;
@@ -143,7 +159,7 @@ public:
     {
     }
 
-    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size) override;
+    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
 
 private:
     std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
@@ -168,7 +184,7 @@ public:
     {
     }
 
-    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size) override;
+    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
 
 private:
     String uri;
@@ -195,7 +211,7 @@ public:
         hdfs_uri = hdfs_uri_.substr(0, begin_of_path);
     }
 
-    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size) override;
+    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
 
 private:
     const Poco::Util::AbstractConfiguration & config;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 1ab243fe1b8..f7d3c23d3b4 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -62,7 +62,7 @@ public:
 
     /** Fast reading data from buffer and save result to memory.
       * Reads at least min_chunk_bytes and some more until the end of the chunk, depends on the format.
-      * Used in ParallelParsingBlockInputStream.
+      * Used in ParallelParsingInputFormat.
       */
     using FileSegmentationEngine = std::function<std::pair<bool, size_t>(
         ReadBuffer & buf,
diff --git a/src/Formats/NativeReader.cpp b/src/Formats/NativeReader.cpp
index 645069bfbdf..ed3aca43d52 100644
--- a/src/Formats/NativeReader.cpp
+++ b/src/Formats/NativeReader.cpp
@@ -44,7 +44,7 @@ NativeReader::NativeReader(ReadBuffer & istr_, UInt64 server_revision_,
 {
     istr_concrete = typeid_cast<CompressedReadBufferFromFile *>(&istr);
     if (!istr_concrete)
-        throw Exception("When need to use index for NativeBlockInputStream, istr must be CompressedReadBufferFromFile.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("When need to use index for NativeReader, istr must be CompressedReadBufferFromFile.", ErrorCodes::LOGICAL_ERROR);
 
     if (index_block_it == index_block_end)
         return;
@@ -80,7 +80,7 @@ void NativeReader::readData(const ISerialization & serialization, ColumnPtr & co
 
     if (column->size() != rows)
         throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
-            "Cannot read all data in NativeBlockInputStream. Rows read: {}. Rows expected: {}", column->size(), rows);
+            "Cannot read all data in NativeReader. Rows read: {}. Rows expected: {}", column->size(), rows);
 }
 
 
diff --git a/src/Formats/NativeWriter.cpp b/src/Formats/NativeWriter.cpp
index eb744e130f7..77692eec6b6 100644
--- a/src/Formats/NativeWriter.cpp
+++ b/src/Formats/NativeWriter.cpp
@@ -35,7 +35,7 @@ NativeWriter::NativeWriter(
     {
         ostr_concrete = typeid_cast<CompressedWriteBuffer *>(&ostr);
         if (!ostr_concrete)
-            throw Exception("When need to write index for NativeBlockOutputStream, ostr must be CompressedWriteBuffer.", ErrorCodes::LOGICAL_ERROR);
+            throw Exception("When need to write index for NativeWriter, ostr must be CompressedWriteBuffer.", ErrorCodes::LOGICAL_ERROR);
     }
 }
 
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index debe7fac8a5..a84e5a3f526 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -13,6 +13,7 @@ add_library(clickhouse_functions ${clickhouse_functions_sources})
 
 target_link_libraries(clickhouse_functions
     PUBLIC
+        ch_contrib::wyhash
         ch_contrib::cityhash
         ch_contrib::farmhash
         clickhouse_dictionaries
diff --git a/src/Functions/FunctionsHashing.cpp b/src/Functions/FunctionsHashing.cpp
index cbafd4bcec2..901234e5443 100644
--- a/src/Functions/FunctionsHashing.cpp
+++ b/src/Functions/FunctionsHashing.cpp
@@ -39,5 +39,7 @@ void registerFunctionsHashing(FunctionFactory & factory)
 
     factory.registerFunction<FunctionXxHash32>();
     factory.registerFunction<FunctionXxHash64>();
+
+    factory.registerFunction<FunctionWyHash64>();
 }
 }
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 750c247b518..c6e66a3d46d 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -5,6 +5,7 @@
 #include <metrohash.h>
 #include <MurmurHash2.h>
 #include <MurmurHash3.h>
+#include <wyhash.h>
 
 #include "config_functions.h"
 #include "config_core.h"
@@ -1369,6 +1370,29 @@ private:
     }
 };
 
+struct ImplWyHash64
+{
+    static constexpr auto name = "wyHash64";
+    using ReturnType = UInt64;
+
+    static UInt64 apply(const char * s, const size_t len)
+    {
+        return wyhash(s, len, 0, _wyp);
+    }
+    static UInt64 combineHashes(UInt64 h1, UInt64 h2)
+    {
+        union
+        {
+            UInt64 u64[2];
+            char chars[16];
+        };
+        u64[0] = h1;
+        u64[1] = h2;
+        return apply(chars, 16);
+    }
+
+    static constexpr bool use_int_hash_for_pods = false;
+};
 
 struct NameIntHash32 { static constexpr auto name = "intHash32"; };
 struct NameIntHash64 { static constexpr auto name = "intHash64"; };
@@ -1406,4 +1430,6 @@ using FunctionHiveHash = FunctionAnyHash<HiveHashImpl>;
 using FunctionXxHash32 = FunctionAnyHash<ImplXxHash32>;
 using FunctionXxHash64 = FunctionAnyHash<ImplXxHash64>;
 
+using FunctionWyHash64 = FunctionAnyHash<ImplWyHash64>;
+
 }
diff --git a/src/Functions/FunctionsStringArray.h b/src/Functions/FunctionsStringArray.h
index 6b3adf46ff5..2680816670f 100644
--- a/src/Functions/FunctionsStringArray.h
+++ b/src/Functions/FunctionsStringArray.h
@@ -477,7 +477,7 @@ public:
                             ErrorCodes::ILLEGAL_COLUMN);
 
         if (!col->getValue<String>().empty())
-            re = Regexps::get<false, false>(col->getValue<String>());
+            re = Regexps::get<false, false, false>(col->getValue<String>());
 
     }
 
@@ -560,7 +560,7 @@ public:
                 + " of first argument of function " + getName() + ". Must be constant string.",
                 ErrorCodes::ILLEGAL_COLUMN);
 
-        re = Regexps::get<false, false>(col->getValue<String>());
+        re = Regexps::get<false, false, false>(col->getValue<String>());
         capture = re->getNumberOfSubpatterns() > 0 ? 1 : 0;
 
         matches.resize(capture + 1);
diff --git a/src/Functions/FunctionsTimeWindow.cpp b/src/Functions/FunctionsTimeWindow.cpp
index 76844e2e6fb..5022c42bc79 100644
--- a/src/Functions/FunctionsTimeWindow.cpp
+++ b/src/Functions/FunctionsTimeWindow.cpp
@@ -417,17 +417,17 @@ struct TimeWindowImpl<HOP>
         {
             ToType wstart = ToStartOfTransform<kind>::execute(time_data[i], hop_num_units, time_zone);
             ToType wend = AddTime<kind>::execute(wstart, hop_num_units, time_zone);
-            wstart = AddTime<kind>::execute(wend, -1 * window_num_units, time_zone);
+            wstart = AddTime<kind>::execute(wend, -window_num_units, time_zone);
             ToType wend_latest;
 
             do
             {
                 wend_latest = wend;
-                wend = AddTime<kind>::execute(wend, -1 * hop_num_units, time_zone);
+                wend = AddTime<kind>::execute(wend, -hop_num_units, time_zone);
             } while (wend > time_data[i]);
 
             end_data[i] = wend_latest;
-            start_data[i] = AddTime<kind>::execute(wend_latest, -1 * window_num_units, time_zone);
+            start_data[i] = AddTime<kind>::execute(wend_latest, -window_num_units, time_zone);
         }
         MutableColumns result;
         result.emplace_back(std::move(start));
@@ -570,7 +570,7 @@ struct TimeWindowImpl<WINDOW_ID>
             do
             {
                 wend_latest = wend;
-                wend = AddTime<kind>::execute(wend, -1 * gcd_num_units, time_zone);
+                wend = AddTime<kind>::execute(wend, -gcd_num_units, time_zone);
             } while (wend > time_data[i]);
 
             end_data[i] = wend_latest;
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 08ac47e692f..026b38b997b 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -24,12 +24,11 @@ namespace ErrorCodes
 /// Is the [I]LIKE expression reduced to finding a substring in a string?
 static inline bool likePatternIsStrstr(const String & pattern, String & res)
 {
-    res = "";
-
     if (pattern.size() < 2 || pattern.front() != '%' || pattern.back() != '%')
         return false;
 
-    res.reserve(pattern.size() * 2);
+    res = "";
+    res.reserve(pattern.size() - 2);
 
     const char * pos = pattern.data();
     const char * end = pos + pattern.size();
@@ -81,7 +80,7 @@ struct MatchImpl
     static void vectorConstant(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
-        const std::string & pattern,
+        const String & pattern,
         const ColumnPtr & start_pos,
         PaddedPODArray<UInt8> & res)
     {
@@ -92,14 +91,13 @@ struct MatchImpl
         if (offsets.empty())
             return;
 
-        String strstr_pattern;
-
         /// A simple case where the [I]LIKE expression reduces to finding a substring in a string
+        String strstr_pattern;
         if (like && likePatternIsStrstr(pattern, strstr_pattern))
         {
-            const UInt8 * begin = data.data();
+            const UInt8 * const begin = data.data();
+            const UInt8 * const end = data.data() + data.size();
             const UInt8 * pos = begin;
-            const UInt8 * end = pos + data.size();
 
             /// The current index in the array of strings.
             size_t i = 0;
@@ -137,7 +135,7 @@ struct MatchImpl
 
             auto regexp = Regexps::get<like, true, case_insensitive>(pattern);
 
-            std::string required_substring;
+            String required_substring;
             bool is_trivial;
             bool required_substring_is_prefix; /// for `anchored` execution of the regexp.
 
@@ -172,9 +170,9 @@ struct MatchImpl
             {
                 /// NOTE This almost matches with the case of LikePatternIsStrstr.
 
-                const UInt8 * begin = data.data();
+                const UInt8 * const begin = data.data();
+                const UInt8 * const end = data.begin() + data.size();
                 const UInt8 * pos = begin;
-                const UInt8 * end = pos + data.size();
 
                 /// The current index in the array of strings.
                 size_t i = 0;
@@ -230,6 +228,7 @@ struct MatchImpl
                     ++i;
                 }
 
+                /// Tail, in which there can be no substring.
                 if (i < res.size())
                     memset(&res[i], revert, (res.size() - i) * sizeof(res[0]));
             }
@@ -238,14 +237,14 @@ struct MatchImpl
 
     /// Very carefully crafted copy-paste.
     static void vectorFixedConstant(
-        const ColumnString::Chars & data, size_t n, const std::string & pattern,
+        const ColumnString::Chars & data, size_t n, const String & pattern,
         PaddedPODArray<UInt8> & res)
     {
         if (data.empty())
             return;
 
-        String strstr_pattern;
         /// A simple case where the LIKE expression reduces to finding a substring in a string
+        String strstr_pattern;
         if (like && likePatternIsStrstr(pattern, strstr_pattern))
         {
             const UInt8 * begin = data.data();
@@ -291,9 +290,9 @@ struct MatchImpl
         {
             size_t size = data.size() / n;
 
-            auto regexp = Regexps::get<like, true>(pattern);
+            auto regexp = Regexps::get<like, true, case_insensitive>(pattern);
 
-            std::string required_substring;
+            String required_substring;
             bool is_trivial;
             bool required_substring_is_prefix; /// for `anchored` execution of the regexp.
 
diff --git a/src/Functions/Regexps.h b/src/Functions/Regexps.h
index 8e6d30c8e14..9a1938a3f32 100644
--- a/src/Functions/Regexps.h
+++ b/src/Functions/Regexps.h
@@ -44,23 +44,20 @@ namespace Regexps
     template <bool like>
     inline Regexp createRegexp(const std::string & pattern, int flags)
     {
-        return {pattern, flags};
-    }
-
-    template <>
-    inline Regexp createRegexp<true>(const std::string & pattern, int flags)
-    {
-        return {likePatternToRegexp(pattern), flags};
+        if constexpr (like)
+            return {likePatternToRegexp(pattern), flags};
+        else
+            return {pattern, flags};
     }
 
     /** Returns holder of an object from Pool.
       * You must hold the ownership while using the object.
       * In destructor, it returns the object back to the Pool for further reuse.
       */
-    template <bool like, bool no_capture, bool case_insensitive = false>
+    template <bool like, bool no_capture, bool case_insensitive>
     inline Pool::Pointer get(const std::string & pattern)
     {
-        /// C++11 has thread-safe function-local static on most modern compilers.
+        /// the Singleton is thread-safe in C++11
         static Pool known_regexps; /// Different variables for different pattern parameters.
 
         return known_regexps.get(pattern, [&pattern]
diff --git a/src/Functions/extract.cpp b/src/Functions/extract.cpp
index 0296602d205..5b138d19747 100644
--- a/src/Functions/extract.cpp
+++ b/src/Functions/extract.cpp
@@ -21,7 +21,7 @@ struct ExtractImpl
         res_data.reserve(data.size() / 5);
         res_offsets.resize(offsets.size());
 
-        const auto & regexp = Regexps::get<false, false>(pattern);
+        const auto & regexp = Regexps::get<false, false, false>(pattern);
 
         unsigned capture = regexp->getNumberOfSubpatterns() > 0 ? 1 : 0;
         OptimizedRegularExpression::MatchVec matches;
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index 057dedab6e4..e6d31e00616 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -95,7 +95,7 @@ public:
             throw Exception("Length of 'needle' argument must be greater than 0.", ErrorCodes::BAD_ARGUMENTS);
 
         using StringPiece = typename Regexps::Regexp::StringPieceType;
-        auto holder = Regexps::get<false, false>(needle);
+        auto holder = Regexps::get<false, false, false>(needle);
         const auto & regexp = holder->getRE2();
 
         if (!regexp)
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index 2286951bb8f..c5b958ec345 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -63,7 +63,7 @@ public:
         if (needle.empty())
             throw Exception(getName() + " length of 'needle' argument must be greater than 0.", ErrorCodes::BAD_ARGUMENTS);
 
-        auto regexp = Regexps::get<false, false>(needle);
+        auto regexp = Regexps::get<false, false, false>(needle);
         const auto & re2 = regexp->getRE2();
 
         if (!re2)
diff --git a/src/IO/Progress.cpp b/src/IO/Progress.cpp
index 1d16f54de7b..45710db5c92 100644
--- a/src/IO/Progress.cpp
+++ b/src/IO/Progress.cpp
@@ -68,10 +68,9 @@ bool Progress::incrementPiecewiseAtomically(const Progress & rhs)
 {
     read_rows += rhs.read_rows;
     read_bytes += rhs.read_bytes;
-    read_raw_bytes += rhs.read_raw_bytes;
 
     total_rows_to_read += rhs.total_rows_to_read;
-    total_raw_bytes_to_read += rhs.total_raw_bytes_to_read;
+    total_bytes_to_read += rhs.total_bytes_to_read;
 
     written_rows += rhs.written_rows;
     written_bytes += rhs.written_bytes;
@@ -83,10 +82,9 @@ void Progress::reset()
 {
     read_rows = 0;
     read_bytes = 0;
-    read_raw_bytes = 0;
 
     total_rows_to_read = 0;
-    total_raw_bytes_to_read = 0;
+    total_bytes_to_read = 0;
 
     written_rows = 0;
     written_bytes = 0;
@@ -98,10 +96,9 @@ ProgressValues Progress::getValues() const
 
     res.read_rows = read_rows.load(std::memory_order_relaxed);
     res.read_bytes = read_bytes.load(std::memory_order_relaxed);
-    res.read_raw_bytes = read_raw_bytes.load(std::memory_order_relaxed);
 
     res.total_rows_to_read = total_rows_to_read.load(std::memory_order_relaxed);
-    res.total_raw_bytes_to_read = total_raw_bytes_to_read.load(std::memory_order_relaxed);
+    res.total_bytes_to_read = total_bytes_to_read.load(std::memory_order_relaxed);
 
     res.written_rows = written_rows.load(std::memory_order_relaxed);
     res.written_bytes = written_bytes.load(std::memory_order_relaxed);
@@ -109,16 +106,31 @@ ProgressValues Progress::getValues() const
     return res;
 }
 
-ProgressValues Progress::fetchAndResetPiecewiseAtomically()
+ProgressValues Progress::fetchValuesAndResetPiecewiseAtomically()
 {
     ProgressValues res;
 
     res.read_rows = read_rows.fetch_and(0);
     res.read_bytes = read_bytes.fetch_and(0);
-    res.read_raw_bytes = read_raw_bytes.fetch_and(0);
 
     res.total_rows_to_read = total_rows_to_read.fetch_and(0);
-    res.total_raw_bytes_to_read = total_raw_bytes_to_read.fetch_and(0);
+    res.total_bytes_to_read = total_bytes_to_read.fetch_and(0);
+
+    res.written_rows = written_rows.fetch_and(0);
+    res.written_bytes = written_bytes.fetch_and(0);
+
+    return res;
+}
+
+Progress Progress::fetchAndResetPiecewiseAtomically()
+{
+    Progress res;
+
+    res.read_rows = read_rows.fetch_and(0);
+    res.read_bytes = read_bytes.fetch_and(0);
+
+    res.total_rows_to_read = total_rows_to_read.fetch_and(0);
+    res.total_bytes_to_read = total_bytes_to_read.fetch_and(0);
 
     res.written_rows = written_rows.fetch_and(0);
     res.written_bytes = written_bytes.fetch_and(0);
@@ -130,10 +142,9 @@ Progress & Progress::operator=(Progress && other) noexcept
 {
     read_rows = other.read_rows.load(std::memory_order_relaxed);
     read_bytes = other.read_bytes.load(std::memory_order_relaxed);
-    read_raw_bytes = other.read_raw_bytes.load(std::memory_order_relaxed);
 
     total_rows_to_read = other.total_rows_to_read.load(std::memory_order_relaxed);
-    total_raw_bytes_to_read = other.total_raw_bytes_to_read.load(std::memory_order_relaxed);
+    total_bytes_to_read = other.total_bytes_to_read.load(std::memory_order_relaxed);
 
     written_rows = other.written_rows.load(std::memory_order_relaxed);
     written_bytes = other.written_bytes.load(std::memory_order_relaxed);
@@ -149,6 +160,7 @@ void Progress::read(ReadBuffer & in, UInt64 server_revision)
     read_rows.store(values.read_rows, std::memory_order_relaxed);
     read_bytes.store(values.read_bytes, std::memory_order_relaxed);
     total_rows_to_read.store(values.total_rows_to_read, std::memory_order_relaxed);
+
     written_rows.store(values.written_rows, std::memory_order_relaxed);
     written_bytes.store(values.written_bytes, std::memory_order_relaxed);
 }
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index 4f1a3df0ffd..f04822f26bb 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -18,10 +18,9 @@ struct ProgressValues
 {
     size_t read_rows;
     size_t read_bytes;
-    size_t read_raw_bytes;
 
     size_t total_rows_to_read;
-    size_t total_raw_bytes_to_read;
+    size_t total_bytes_to_read;
 
     size_t written_rows;
     size_t written_bytes;
@@ -68,15 +67,12 @@ struct Progress
 {
     std::atomic<size_t> read_rows {0};        /// Rows (source) processed.
     std::atomic<size_t> read_bytes {0};       /// Bytes (uncompressed, source) processed.
-    std::atomic<size_t> read_raw_bytes {0};   /// Raw bytes processed.
 
     /** How much rows/bytes must be processed, in total, approximately. Non-zero value is sent when there is information about
       * some new part of job. Received values must be summed to get estimate of total rows to process.
-      * `total_raw_bytes_to_process` is used for file table engine or when reading from file descriptor.
-      * Used for rendering progress bar on client.
       */
     std::atomic<size_t> total_rows_to_read {0};
-    std::atomic<size_t> total_raw_bytes_to_read {0};
+    std::atomic<size_t> total_bytes_to_read {0};
 
     std::atomic<size_t> written_rows {0};
     std::atomic<size_t> written_bytes {0};
@@ -93,7 +89,7 @@ struct Progress
         : written_rows(write_progress.written_rows), written_bytes(write_progress.written_bytes)  {}
 
     explicit Progress(FileProgress file_progress)
-        : read_raw_bytes(file_progress.read_bytes), total_raw_bytes_to_read(file_progress.total_bytes_to_read) {}
+        : read_bytes(file_progress.read_bytes), total_bytes_to_read(file_progress.total_bytes_to_read) {}
 
     void read(ReadBuffer & in, UInt64 server_revision);
 
@@ -109,7 +105,9 @@ struct Progress
 
     ProgressValues getValues() const;
 
-    ProgressValues fetchAndResetPiecewiseAtomically();
+    ProgressValues fetchValuesAndResetPiecewiseAtomically();
+
+    Progress fetchAndResetPiecewiseAtomically();
 
     Progress & operator=(Progress && other) noexcept;
 
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index 92346615a7a..6a154c60987 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -80,6 +80,7 @@ struct ReadSettings
     bool enable_filesystem_cache = true;
     size_t filesystem_cache_max_wait_sec = 1;
     bool read_from_filesystem_cache_if_exists_otherwise_bypass_cache = false;
+    bool enable_filesystem_cache_log = false;
 
     size_t remote_read_min_bytes_for_seek = DBMS_DEFAULT_BUFFER_SIZE;
 
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 9471b5d319b..342a512ee52 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -151,6 +151,13 @@ void WriteBufferFromS3::allocateBuffer()
 
 WriteBufferFromS3::~WriteBufferFromS3()
 {
+#ifndef NDEBUG
+    if (!is_finalized)
+    {
+        LOG_ERROR(log, "WriteBufferFromS3 is not finalized in destructor. It's a bug");
+        std::terminate();
+    }
+#else
     try
     {
         finalize();
@@ -159,6 +166,7 @@ WriteBufferFromS3::~WriteBufferFromS3()
     {
         tryLogCurrentException(__PRETTY_FUNCTION__);
     }
+#endif
 }
 
 bool WriteBufferFromS3::cacheEnabled() const
@@ -192,6 +200,8 @@ void WriteBufferFromS3::finalizeImpl()
 
     if (!multipart_upload_id.empty())
         completeMultipartUpload();
+
+    is_finalized = true;
 }
 
 void WriteBufferFromS3::createMultipartUpload()
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 19faf0b1488..6279e519be0 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -47,7 +47,7 @@ class WriteBufferFromFile;
 class WriteBufferFromS3 final : public BufferWithOwnMemory<WriteBuffer>
 {
 public:
-    explicit WriteBufferFromS3(
+    WriteBufferFromS3(
         std::shared_ptr<Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
@@ -105,6 +105,7 @@ private:
     std::vector<String> part_tags;
 
     bool is_prefinalized = false;
+    bool is_finalized = false;
 
     /// Following fields are for background uploads in thread pool (if specified).
     /// We use std::function to avoid dependency of Interpreters
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 1ff82c8ea60..d11dfc3b8ad 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -214,7 +214,7 @@ public:
     ActionsDAGPtr clone() const;
 
     /// Execute actions for header. Input block must have empty columns.
-    /// Result should be equal to the execution of ExpressionActions build form this DAG.
+    /// Result should be equal to the execution of ExpressionActions built from this DAG.
     /// Actions are not changed, no expressions are compiled.
     ///
     /// In addition, check that result constants are constants according to DAG.
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index a76558cbc9d..0bd0ea9f444 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -1194,9 +1194,18 @@ void NO_INLINE Aggregator::executeOnIntervalWithoutKeyImpl(
     for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
     {
         if (inst->offsets)
-            inst->batch_that->addBatchSinglePlaceFromInterval(inst->offsets[row_begin], inst->offsets[row_end - 1], res + inst->state_offset, inst->batch_arguments, arena);
+            inst->batch_that->addBatchSinglePlaceFromInterval(
+                inst->offsets[static_cast<ssize_t>(row_begin) - 1],
+                inst->offsets[row_end - 1],
+                res + inst->state_offset,
+                inst->batch_arguments, arena);
         else
-            inst->batch_that->addBatchSinglePlaceFromInterval(row_begin, row_end, res + inst->state_offset, inst->batch_arguments, arena);
+            inst->batch_that->addBatchSinglePlaceFromInterval(
+                row_begin,
+                row_end,
+                res + inst->state_offset,
+                inst->batch_arguments,
+                arena);
     }
 }
 
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index e7cf3c85a15..1806465db4a 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -18,6 +18,7 @@
 #include <Common/ColumnsHashing.h>
 #include <Common/assert_cast.h>
 #include <Common/filesystemHelpers.h>
+#include <Core/ColumnNumbers.h>
 
 #include <QueryPipeline/SizeLimits.h>
 
@@ -991,9 +992,13 @@ public:
         }
 
         /// Only parameters that matter during merge.
-        Params(const Block & intermediate_header_,
-            const ColumnNumbers & keys_, const AggregateDescriptions & aggregates_, bool overflow_row_, size_t max_threads_)
-            : Params(Block(), keys_, aggregates_, overflow_row_, 0, OverflowMode::THROW, 0, 0, 0, false, nullptr, max_threads_, 0, false, 0)
+        Params(
+            const Block & intermediate_header_,
+            const ColumnNumbers & keys_,
+            const AggregateDescriptions & aggregates_,
+            bool overflow_row_,
+            size_t max_threads_)
+            : Params(Block(), keys_, aggregates_, overflow_row_, 0, OverflowMode::THROW, 0, 0, 0, false, nullptr, max_threads_, 0, false, 0, {}, {})
         {
             intermediate_header = intermediate_header_;
         }
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index ef1888345e6..d817988e7b6 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -286,8 +286,9 @@ Cluster::Address Cluster::Address::fromFullString(const String & full_string)
 
 /// Implementation of Clusters class
 
-Clusters::Clusters(const Poco::Util::AbstractConfiguration & config, const Settings & settings, const String & config_prefix)
+Clusters::Clusters(const Poco::Util::AbstractConfiguration & config, const Settings & settings, MultiVersion<Macros>::Version macros, const String & config_prefix)
 {
+    this->macros_ = macros;
     updateClusters(config, settings, config_prefix);
 }
 
@@ -296,7 +297,8 @@ ClusterPtr Clusters::getCluster(const std::string & cluster_name) const
 {
     std::lock_guard lock(mutex);
 
-    auto it = impl.find(cluster_name);
+    auto expanded_cluster_name = macros_->expand(cluster_name);
+    auto it = impl.find(expanded_cluster_name);
     return (it != impl.end()) ? it->second : nullptr;
 }
 
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index df781188d60..7c8d15d0350 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -2,6 +2,8 @@
 
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
+#include <Common/Macros.h>
+#include <Common/MultiVersion.h>
 
 #include <Poco/Net/SocketAddress.h>
 
@@ -290,7 +292,7 @@ using ClusterPtr = std::shared_ptr<Cluster>;
 class Clusters
 {
 public:
-    Clusters(const Poco::Util::AbstractConfiguration & config, const Settings & settings, const String & config_prefix = "remote_servers");
+    Clusters(const Poco::Util::AbstractConfiguration & config, const Settings & settings, MultiVersion<Macros>::Version macros, const String & config_prefix = "remote_servers");
 
     Clusters(const Clusters &) = delete;
     Clusters & operator=(const Clusters &) = delete;
@@ -309,6 +311,8 @@ protected:
     /// setup outside of this class, stored to prevent deleting from impl on config update
     std::unordered_set<std::string> automatic_clusters;
 
+    MultiVersion<Macros>::Version macros_;
+
     Impl impl;
     mutable std::mutex mutex;
 };
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 4cf85870e48..d38bbe0fd5b 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -37,8 +37,8 @@ class IStreamFactory;
 ContextMutablePtr updateSettingsForCluster(
     const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log = nullptr);
 
-/// Execute a distributed query, creating a vector of BlockInputStreams, from which the result can be read.
-/// `stream_factory` object encapsulates the logic of creating streams for a different type of query
+/// Execute a distributed query, creating a query plan, from which the query pipeline can be built.
+/// `stream_factory` object encapsulates the logic of creating plans for a different type of query
 /// (currently SELECT, DESCRIBE).
 void executeQuery(
     QueryPlan & query_plan,
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 0ef024f7f47..1bd3f92a5b7 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -2334,7 +2334,7 @@ void Context::reloadClusterConfig() const
         }
 
         const auto & config = cluster_config ? *cluster_config : getConfigRef();
-        auto new_clusters = std::make_shared<Clusters>(config, settings);
+        auto new_clusters = std::make_shared<Clusters>(config, settings, getMacros());
 
         {
             std::lock_guard lock(shared->clusters_mutex);
@@ -2356,7 +2356,7 @@ std::shared_ptr<Clusters> Context::getClusters() const
     if (!shared->clusters)
     {
         const auto & config = shared->clusters_config ? *shared->clusters_config : getConfigRef();
-        shared->clusters = std::make_shared<Clusters>(config, settings);
+        shared->clusters = std::make_shared<Clusters>(config, settings, getMacros());
     }
 
     return shared->clusters;
@@ -2387,7 +2387,7 @@ void Context::setClustersConfig(const ConfigurationPtr & config, bool enable_dis
     shared->clusters_config = config;
 
     if (!shared->clusters)
-        shared->clusters = std::make_shared<Clusters>(*shared->clusters_config, settings, config_name);
+        shared->clusters = std::make_shared<Clusters>(*shared->clusters_config, settings, getMacros(), config_name);
     else
         shared->clusters->updateClusters(*shared->clusters_config, settings, config_name, old_clusters_config);
 }
@@ -3417,6 +3417,7 @@ ReadSettings Context::getReadSettings() const
     res.enable_filesystem_cache = settings.enable_filesystem_cache;
     res.filesystem_cache_max_wait_sec = settings.filesystem_cache_max_wait_sec;
     res.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
+    res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
 
     res.remote_read_min_bytes_for_seek = settings.remote_read_min_bytes_for_seek;
 
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index c986aa9ec5a..d438ea9394e 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -18,11 +18,14 @@
 #include <Parsers/ParserTablesInSelectQuery.h>
 #include <Parsers/parseQuery.h>
 
+#include <Common/logger_useful.h>
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int INCORRECT_QUERY;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
 }
@@ -232,11 +235,26 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
         auto asts_to_join_on = moveExpressionToJoinOn(select.where(), joined_tables, data.tables_with_columns, data.aliases);
         for (size_t i = 1; i < joined_tables.size(); ++i)
         {
+            auto & joined = joined_tables[i];
+            if (joined.tableJoin()->kind != ASTTableJoin::Kind::Cross)
+                continue;
+
+            String query_before = queryToString(*joined.tableJoin());
+            bool rewritten = false;
             const auto & expr_it = asts_to_join_on.find(i);
             if (expr_it != asts_to_join_on.end())
             {
-                if (joined_tables[i].rewriteCrossToInner(makeOnExpression(expr_it->second)))
-                    data.done = true;
+                ASTPtr on_expr = makeOnExpression(expr_it->second);
+                if (rewritten = joined.rewriteCrossToInner(on_expr); rewritten)
+                {
+                    LOG_DEBUG(&Poco::Logger::get("CrossToInnerJoin"), "Rewritten '{}' to '{}'", query_before, queryToString(*joined.tableJoin()));
+                }
+            }
+
+            if (data.cross_to_inner_join_rewrite > 1 && !rewritten)
+            {
+                throw Exception(ErrorCodes::INCORRECT_QUERY, "Failed to rewrite '{} WHERE {}' to INNER JOIN",
+                                query_before, queryToString(select.where()));
             }
         }
     }
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.h b/src/Interpreters/CrossToInnerJoinVisitor.h
index 885cf8162c1..704be42d3c1 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.h
+++ b/src/Interpreters/CrossToInnerJoinVisitor.h
@@ -18,8 +18,7 @@ public:
         const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns;
         const Aliases & aliases;
         const String current_database;
-        bool done = false;
-        bool cross_to_inner_join_rewrite = true;
+        UInt8 cross_to_inner_join_rewrite = 1;
     };
 
     static bool needChildVisit(ASTPtr &, const ASTPtr &);
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 42cf9e92b32..71fcd7a1884 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -383,7 +383,7 @@ ContextMutablePtr DatabaseReplicatedTask::makeQueryContext(ContextPtr from_conte
         txn->addOp(zkutil::makeSetRequest(database->zookeeper_path + "/max_log_ptr", toString(getLogEntryNumber(entry_name)), -1));
     }
 
-    txn->addOp(zkutil::makeSetRequest(database->replica_path + "/log_ptr", toString(getLogEntryNumber(entry_name)), -1));
+    txn->addOp(getOpToUpdateLogPointer());
 
     for (auto & op : ops)
         txn->addOp(std::move(op));
@@ -392,6 +392,11 @@ ContextMutablePtr DatabaseReplicatedTask::makeQueryContext(ContextPtr from_conte
     return query_context;
 }
 
+Coordination::RequestPtr DatabaseReplicatedTask::getOpToUpdateLogPointer()
+{
+    return zkutil::makeSetRequest(database->replica_path + "/log_ptr", toString(getLogEntryNumber(entry_name)), -1);
+}
+
 String DDLTaskBase::getLogEntryName(UInt32 log_entry_number)
 {
     return zkutil::getSequentialNodeName("query-", log_entry_number);
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index ee49274707a..d3728918a2d 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -107,6 +107,7 @@ struct DDLTaskBase
     virtual String getShardID() const = 0;
 
     virtual ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper);
+    virtual Coordination::RequestPtr getOpToUpdateLogPointer() { return nullptr; }
 
     inline String getActiveNodePath() const { return fs::path(entry_path) / "active" / host_id_str; }
     inline String getFinishedNodePath() const { return fs::path(entry_path) / "finished" / host_id_str; }
@@ -145,6 +146,7 @@ struct DatabaseReplicatedTask : public DDLTaskBase
     String getShardID() const override;
     void parseQueryFromEntry(ContextPtr context) override;
     ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper) override;
+    Coordination::RequestPtr getOpToUpdateLogPointer() override;
 
     DatabaseReplicated * database;
 };
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 406a4e90442..0e12c5e9e5a 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -180,7 +180,7 @@ DDLTaskPtr DDLWorker::initAndCheckTask(const String & entry_name, String & out_r
     {
         /// What should we do if we even cannot parse host name and therefore cannot properly submit execution status?
         /// We can try to create fail node using FQDN if it equal to host name in cluster config attempt will be successful.
-        /// Otherwise, that node will be ignored by DDLQueryStatusInputStream.
+        /// Otherwise, that node will be ignored by DDLQueryStatusSource.
         out_reason = "Incorrect task format";
         write_error_status(host_fqdn_id, ExecutionStatus::fromCurrentException().serializeText(), out_reason);
         return {};
@@ -715,6 +715,8 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
     if (zookeeper->exists(is_executed_path, nullptr, event))
     {
         LOG_DEBUG(log, "Task {} has already been executed by replica ({}) of the same shard.", task.entry_name, zookeeper->get(is_executed_path));
+        if (auto op = task.getOpToUpdateLogPointer())
+            task.ops.push_back(op);
         return true;
     }
 
@@ -759,6 +761,8 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
             {
                 LOG_DEBUG(log, "Task {} has already been executed by replica ({}) of the same shard.", task.entry_name, executed_by);
                 executed_by_other_leader = true;
+                if (auto op = task.getOpToUpdateLogPointer())
+                    task.ops.push_back(op);
                 break;
             }
 
@@ -786,6 +790,8 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
         {
             LOG_DEBUG(log, "Task {} has already been executed by replica ({}) of the same shard.", task.entry_name, zookeeper->get(is_executed_path));
             executed_by_other_leader = true;
+            if (auto op = task.getOpToUpdateLogPointer())
+                task.ops.push_back(op);
             break;
         }
         else
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 7cdbf880a2b..dc93b602a29 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -91,7 +91,7 @@ protected:
     /// Executes query only on leader replica in case of replicated table.
     /// Queries like TRUNCATE/ALTER .../OPTIMIZE have to be executed only on one node of shard.
     /// Most of these queries can be executed on non-leader replica, but actually they still send
-    /// query via RemoteBlockOutputStream to leader, so to avoid such "2-phase" query execution we
+    /// query via RemoteQueryExecutor to leader, so to avoid such "2-phase" query execution we
     /// execute query directly on leader.
     bool tryExecuteQueryOnLeaderReplica(
         DDLTaskBase & task,
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 0a156ba0b3e..37965f11c83 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -43,7 +43,9 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Core/NamesAndTypes.h>
 
+#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeFactory.h>
 
 #include <Interpreters/ActionsVisitor.h>
@@ -325,6 +327,12 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
         {
             NameSet unique_keys;
             ASTs & group_asts = group_by_ast->children;
+
+            /// For GROUPING SETS with multiple groups we always add virtual __grouping_set column
+            /// With set number, which is used as an additional key at the stage of merging aggregating data.
+            if (select_query->group_by_with_grouping_sets && group_asts.size() > 1)
+                aggregated_columns.emplace_back("__grouping_set", std::make_shared<DataTypeUInt64>());
+
             for (ssize_t i = 0; i < static_cast<ssize_t>(group_asts.size()); ++i)
             {
                 ssize_t size = group_asts.size();
@@ -332,46 +340,105 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                 if (getContext()->getSettingsRef().enable_positional_arguments)
                     replaceForPositionalArguments(group_asts[i], select_query, ASTSelectQuery::Expression::GROUP_BY);
 
-                getRootActionsNoMakeSet(group_asts[i], temp_actions, false);
-
-                const auto & column_name = group_asts[i]->getColumnName();
-
-                const auto * node = temp_actions->tryFindInIndex(column_name);
-                if (!node)
-                    throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
-
-                /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
-                if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
+                if (select_query->group_by_with_grouping_sets)
                 {
-                    /// Constant expressions have non-null column pointer at this stage.
-                    if (node->column && isColumnConst(*node->column))
+                    ASTs group_elements_ast;
+                    const ASTExpressionList * group_ast_element = group_asts[i]->as<const ASTExpressionList>();
+                    group_elements_ast = group_ast_element->children;
+
+                    NamesAndTypesList grouping_set_list;
+
+                    for (ssize_t j = 0; j < ssize_t(group_elements_ast.size()); ++j)
                     {
-                        select_query->group_by_with_constant_keys = true;
+                        getRootActionsNoMakeSet(group_elements_ast[j], temp_actions, false);
 
-                        /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
-                        if (!aggregate_descriptions.empty() || size > 1)
+                        ssize_t group_size = group_elements_ast.size();
+                        const auto & column_name = group_elements_ast[j]->getColumnName();
+                        const auto * node = temp_actions->tryFindInIndex(column_name);
+                        if (!node)
+                            throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
+
+                        /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
+                        if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
                         {
-                            if (i + 1 < static_cast<ssize_t>(size))
-                                group_asts[i] = std::move(group_asts.back());
+                            /// Constant expressions have non-null column pointer at this stage.
+                            if (node->column && isColumnConst(*node->column))
+                            {
+                                select_query->group_by_with_constant_keys = true;
 
-                            group_asts.pop_back();
+                                /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
+                                if (!aggregate_descriptions.empty() || group_size > 1)
+                                {
+                                    if (j + 1 < static_cast<ssize_t>(group_size))
+                                        group_elements_ast[j] = std::move(group_elements_ast.back());
 
-                            --i;
-                            continue;
+                                    group_elements_ast.pop_back();
+
+                                    --j;
+                                    continue;
+                                }
+                            }
+                        }
+
+                        NameAndTypePair key{column_name, node->result_type};
+
+                        grouping_set_list.push_back(key);
+
+                        /// Aggregation keys are unique.
+                        if (!unique_keys.contains(key.name))
+                        {
+                            unique_keys.insert(key.name);
+                            aggregation_keys.push_back(key);
+
+                            /// Key is no longer needed, therefore we can save a little by moving it.
+                            aggregated_columns.push_back(std::move(key));
                         }
                     }
+
+                    aggregation_keys_list.push_back(std::move(grouping_set_list));
                 }
-
-                NameAndTypePair key{column_name, node->result_type};
-
-                /// Aggregation keys are uniqued.
-                if (!unique_keys.contains(key.name))
+                else
                 {
-                    unique_keys.insert(key.name);
-                    aggregation_keys.push_back(key);
+                    getRootActionsNoMakeSet(group_asts[i], temp_actions, false);
 
-                    /// Key is no longer needed, therefore we can save a little by moving it.
-                    aggregated_columns.push_back(std::move(key));
+                    const auto & column_name = group_asts[i]->getColumnName();
+                    const auto * node = temp_actions->tryFindInIndex(column_name);
+                    if (!node)
+                        throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
+
+                    /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
+                    if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
+                    {
+                        /// Constant expressions have non-null column pointer at this stage.
+                        if (node->column && isColumnConst(*node->column))
+                        {
+                            select_query->group_by_with_constant_keys = true;
+
+                            /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
+                            if (!aggregate_descriptions.empty() || size > 1)
+                            {
+                                if (i + 1 < static_cast<ssize_t>(size))
+                                    group_asts[i] = std::move(group_asts.back());
+
+                                group_asts.pop_back();
+
+                                --i;
+                                continue;
+                            }
+                        }
+                    }
+
+                    NameAndTypePair key{column_name, node->result_type};
+
+                    /// Aggregation keys are uniqued.
+                    if (!unique_keys.contains(key.name))
+                    {
+                        unique_keys.insert(key.name);
+                        aggregation_keys.push_back(key);
+
+                        /// Key is no longer needed, therefore we can save a little by moving it.
+                        aggregated_columns.push_back(std::move(key));
+                    }
                 }
             }
 
@@ -726,6 +793,8 @@ void makeWindowDescriptionFromAST(const Context & context,
 
 void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
 {
+    auto current_context = getContext();
+
     // Window definitions from the WINDOW clause
     const auto * select_query = query->as<ASTSelectQuery>();
     if (select_query && select_query->window())
@@ -735,7 +804,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
             const auto & elem = ptr->as<const ASTWindowListElement &>();
             WindowDescription desc;
             desc.window_name = elem.name;
-            makeWindowDescriptionFromAST(*getContext(), window_descriptions,
+            makeWindowDescriptionFromAST(*current_context, window_descriptions,
                 desc, elem.definition.get());
 
             auto [it, inserted] = window_descriptions.insert(
@@ -820,7 +889,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
                 const ASTWindowDefinition &>();
             WindowDescription desc;
             desc.window_name = definition.getDefaultWindowName();
-            makeWindowDescriptionFromAST(*getContext(), window_descriptions,
+            makeWindowDescriptionFromAST(*current_context, window_descriptions,
                 desc, &definition);
 
             auto [it, inserted] = window_descriptions.insert(
@@ -835,6 +904,18 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
             it->second.window_functions.push_back(window_function);
         }
     }
+
+    bool compile_sort_description = current_context->getSettingsRef().compile_sort_description;
+    size_t min_count_to_compile_sort_description = current_context->getSettingsRef().min_count_to_compile_sort_description;
+
+    for (auto & [_, window_description] : window_descriptions)
+    {
+        window_description.full_sort_description.compile_sort_description = compile_sort_description;
+        window_description.full_sort_description.min_count_to_compile_sort_description = min_count_to_compile_sort_description;
+
+        window_description.partition_by.compile_sort_description = compile_sort_description;
+        window_description.partition_by.min_count_to_compile_sort_description = min_count_to_compile_sort_description;
+    }
 }
 
 
@@ -1169,10 +1250,24 @@ bool SelectQueryExpressionAnalyzer::appendGroupBy(ExpressionActionsChain & chain
     ExpressionActionsChain::Step & step = chain.lastStep(columns_after_join);
 
     ASTs asts = select_query->groupBy()->children;
-    for (const auto & ast : asts)
+    if (select_query->group_by_with_grouping_sets)
     {
-        step.addRequiredOutput(ast->getColumnName());
-        getRootActions(ast, only_types, step.actions());
+        for (const auto & ast : asts)
+        {
+            for (const auto & ast_element : ast->children)
+            {
+                step.addRequiredOutput(ast_element->getColumnName());
+                getRootActions(ast_element, only_types, step.actions());
+            }
+        }
+    }
+    else
+    {
+        for (const auto & ast : asts)
+        {
+            step.addRequiredOutput(ast->getColumnName());
+            getRootActions(ast, only_types, step.actions());
+        }
     }
 
     if (optimize_aggregation_in_order)
@@ -1584,6 +1679,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
     , second_stage(second_stage_)
     , need_aggregate(query_analyzer.hasAggregation())
     , has_window(query_analyzer.hasWindow())
+    , use_grouping_set_key(query_analyzer.useGroupingSetKey())
 {
     /// first_stage: Do I need to perform the first part of the pipeline - running on remote servers during distributed processing.
     /// second_stage: Do I need to execute the second part of the pipeline - running on the initiating server during distributed processing.
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 0fbd9cdaac1..b3704095c92 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -64,6 +64,7 @@ struct ExpressionAnalyzerData
 
     bool has_aggregation = false;
     NamesAndTypesList aggregation_keys;
+    NamesAndTypesLists aggregation_keys_list;
     bool has_const_aggregation_keys = false;
     AggregateDescriptions aggregate_descriptions;
 
@@ -221,6 +222,8 @@ struct ExpressionAnalysisResult
     bool optimize_aggregation_in_order = false;
     bool join_has_delayed_stream = false;
 
+    bool use_grouping_set_key = false;
+
     ActionsDAGPtr before_array_join;
     ArrayJoinActionPtr array_join;
     ActionsDAGPtr before_join;
@@ -321,8 +324,11 @@ public:
     bool hasGlobalSubqueries() { return has_global_subqueries; }
     bool hasTableJoin() const { return syntax->ast_join; }
 
+    bool useGroupingSetKey() const { return aggregation_keys_list.size() > 1; }
+
     const NamesAndTypesList & aggregationKeys() const { return aggregation_keys; }
     bool hasConstAggregationKeys() const { return has_const_aggregation_keys; }
+    const NamesAndTypesLists & aggregationKeysList() const { return aggregation_keys_list; }
     const AggregateDescriptions & aggregates() const { return aggregate_descriptions; }
 
     std::unique_ptr<QueryPlan> getJoinedPlan();
diff --git a/src/Interpreters/FilesystemCacheLog.cpp b/src/Interpreters/FilesystemCacheLog.cpp
index 9eec65a38ab..a8470ca15ba 100644
--- a/src/Interpreters/FilesystemCacheLog.cpp
+++ b/src/Interpreters/FilesystemCacheLog.cpp
@@ -37,6 +37,7 @@ NamesAndTypesList FilesystemCacheLogElement::getNamesAndTypes()
         {"file_segment_range", std::make_shared<DataTypeTuple>(std::move(types))},
         {"size", std::make_shared<DataTypeUInt64>()},
         {"read_type", std::make_shared<DataTypeString>()},
+        {"cache_attempted", std::make_shared<DataTypeUInt8>()},
     };
 }
 
@@ -53,6 +54,7 @@ void FilesystemCacheLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(Tuple{file_segment_range.first, file_segment_range.second});
     columns[i++]->insert(file_segment_size);
     columns[i++]->insert(typeToString(read_type));
+    columns[i++]->insert(cache_attempted);
 }
 
 };
diff --git a/src/Interpreters/FilesystemCacheLog.h b/src/Interpreters/FilesystemCacheLog.h
index 208f53a76cf..bef5a82d39b 100644
--- a/src/Interpreters/FilesystemCacheLog.h
+++ b/src/Interpreters/FilesystemCacheLog.h
@@ -39,6 +39,7 @@ struct FilesystemCacheLogElement
     std::pair<size_t, size_t> file_segment_range{};
     ReadType read_type{};
     size_t file_segment_size;
+    bool cache_attempted;
 
     static std::string name() { return "FilesystemCacheLog"; }
 
diff --git a/src/Interpreters/FillingRow.h b/src/Interpreters/FillingRow.h
index 626bee70896..331c237285b 100644
--- a/src/Interpreters/FillingRow.h
+++ b/src/Interpreters/FillingRow.h
@@ -13,7 +13,7 @@ bool equals(const Field & lhs, const Field & rhs);
 
 /** Helps to implement modifier WITH FILL for ORDER BY clause.
  *  Stores row as array of fields and provides functions to generate next row for filling gaps and for comparing rows.
- *  Used in FillingBlockInputStream and in FillingTransform.
+ *  Used in FillingTransform.
  */
 class FillingRow
 {
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 01a1e063ee3..b36940de501 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -2,6 +2,7 @@
 
 #include <Access/Common/AccessFlags.h>
 #include <Access/EnabledQuota.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Columns/ColumnNullable.h>
 #include <Processors/Transforms/buildPushingToViewsChain.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -156,7 +157,18 @@ Block InterpreterInsertQuery::getSampleBlock(
     return res;
 }
 
+static bool hasAggregateFunctions(const IAST * ast)
+{
+    if (const auto * func = typeid_cast<const ASTFunction *>(ast))
+        if (AggregateFunctionFactory::instance().isAggregateFunctionName(func->name))
+            return true;
 
+    for (const auto & child : ast->children)
+        if (hasAggregateFunctions(child.get()))
+            return true;
+
+    return false;
+}
 /** A query that just reads all data without any complex computations or filetering.
   * If we just pipe the result to INSERT, we don't have to use too many threads for read.
   */
@@ -189,7 +201,8 @@ static bool isTrivialSelect(const ASTPtr & select)
             && !select_query->groupBy()
             && !select_query->having()
             && !select_query->orderBy()
-            && !select_query->limitBy());
+            && !select_query->limitBy()
+            && !hasAggregateFunctions(select_query));
     }
     /// This query is ASTSelectWithUnionQuery subquery
     return false;
@@ -399,7 +412,7 @@ BlockIO InterpreterInsertQuery::execute()
                     for (size_t col_idx = 0; col_idx < query_columns.size(); ++col_idx)
                     {
                         /// Change query sample block columns to Nullable to allow inserting nullable columns, where NULL values will be substituted with
-                        /// default column values (in AddingDefaultBlockOutputStream), so all values will be cast correctly.
+                        /// default column values (in AddingDefaultsTransform), so all values will be cast correctly.
                         if (input_columns[col_idx].type->isNullable() && !query_columns[col_idx].type->isNullable() && output_columns.hasDefault(query_columns[col_idx].name))
                             query_sample_block.setColumn(col_idx, ColumnWithTypeAndName(makeNullable(query_columns[col_idx].column), makeNullable(query_columns[col_idx].type), query_columns[col_idx].name));
                     }
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 848d69834d2..6bfadc66352 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -81,6 +81,8 @@
 #include <Common/FieldVisitorToString.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
+#include <Core/ColumnNumbers.h>
+#include <Interpreters/Aggregator.h>
 #include <base/map.h>
 #include <Common/scope_guard_safe.h>
 #include <memory>
@@ -218,7 +220,7 @@ static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & table
     QueryAliasesNoSubqueriesVisitor(aliases).visit(select.select());
 
     CrossToInnerJoinVisitor::Data cross_to_inner{tables, aliases, database};
-    cross_to_inner.cross_to_inner_join_rewrite = settings.cross_to_inner_join_rewrite;
+    cross_to_inner.cross_to_inner_join_rewrite = static_cast<UInt8>(std::min<UInt64>(settings.cross_to_inner_join_rewrite, 2));
     CrossToInnerJoinVisitor(cross_to_inner).visit(query);
 
     JoinToSubqueryTransformVisitor::Data join_to_subs_data{tables, aliases};
@@ -736,6 +738,9 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
 
         Block res;
 
+        if (analysis_result.use_grouping_set_key)
+            res.insert({ nullptr, std::make_shared<DataTypeUInt64>(), "__grouping_set" });
+
         for (const auto & key : query_analyzer->aggregationKeys())
             res.insert({nullptr, header.getByName(key.name).type, key.name});
 
@@ -858,6 +863,9 @@ static SortDescription getSortDescription(const ASTSelectQuery & query, ContextP
             order_descr.emplace_back(name, order_by_elem.direction, order_by_elem.nulls_direction, collator);
     }
 
+    order_descr.compile_sort_description = context->getSettingsRef().compile_sort_description;
+    order_descr.min_count_to_compile_sort_description = context->getSettingsRef().min_count_to_compile_sort_description;
+
     return order_descr;
 }
 
@@ -1082,6 +1090,11 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
         options.to_stage > QueryProcessingStage::WithMergeableState &&
         !query.group_by_with_totals && !query.group_by_with_rollup && !query.group_by_with_cube;
 
+    bool use_grouping_set_key = expressions.use_grouping_set_key;
+
+    if (query.group_by_with_grouping_sets && query.group_by_with_totals)
+       throw Exception("WITH TOTALS and GROUPING SETS are not supported together", ErrorCodes::NOT_IMPLEMENTED);
+
     if (query_info.projection && query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
     {
         query_info.projection->aggregate_overflow_row = aggregate_overflow_row;
@@ -1196,7 +1209,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
 
             preliminary_sort();
             if (expressions.need_aggregate)
-                executeMergeAggregated(query_plan, aggregate_overflow_row, aggregate_final);
+                executeMergeAggregated(query_plan, aggregate_overflow_row, aggregate_final, use_grouping_set_key);
         }
         if (from_aggregation_stage)
         {
@@ -1301,6 +1314,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
             {
                 executeAggregation(
                     query_plan, expressions.before_aggregation, aggregate_overflow_row, aggregate_final, query_info.input_order_info);
+
                 /// We need to reset input order info, so that executeOrder can't use it
                 query_info.input_order_info.reset();
                 if (query_info.projection)
@@ -1356,7 +1370,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
             {
                 /// If you need to combine aggregated results from multiple servers
                 if (!expressions.first_stage)
-                    executeMergeAggregated(query_plan, aggregate_overflow_row, aggregate_final);
+                    executeMergeAggregated(query_plan, aggregate_overflow_row, aggregate_final, use_grouping_set_key);
 
                 if (!aggregate_final)
                 {
@@ -1372,20 +1386,18 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                     else if (query.group_by_with_cube)
                         executeRollupOrCube(query_plan, Modificator::CUBE);
 
-                    if ((query.group_by_with_rollup || query.group_by_with_cube) && expressions.hasHaving())
+                    if ((query.group_by_with_rollup || query.group_by_with_cube || query.group_by_with_grouping_sets) && expressions.hasHaving())
                     {
                         if (query.group_by_with_totals)
-                            throw Exception(
-                                "WITH TOTALS and WITH ROLLUP or CUBE are not supported together in presence of HAVING",
-                                ErrorCodes::NOT_IMPLEMENTED);
+                            throw Exception("WITH TOTALS and WITH ROLLUP or CUBE or GROUPING SETS are not supported together in presence of HAVING", ErrorCodes::NOT_IMPLEMENTED);
                         executeHaving(query_plan, expressions.before_having, expressions.remove_having_filter);
                     }
                 }
                 else if (expressions.hasHaving())
                     executeHaving(query_plan, expressions.before_having, expressions.remove_having_filter);
             }
-            else if (query.group_by_with_totals || query.group_by_with_rollup || query.group_by_with_cube)
-                throw Exception("WITH TOTALS, ROLLUP or CUBE are not supported without aggregation", ErrorCodes::NOT_IMPLEMENTED);
+            else if (query.group_by_with_totals || query.group_by_with_rollup || query.group_by_with_cube || query.group_by_with_grouping_sets)
+                throw Exception("WITH TOTALS, ROLLUP, CUBE or GROUPING SETS are not supported without aggregation", ErrorCodes::NOT_IMPLEMENTED);
 
             // Now we must execute:
             // 1) expressions before window functions,
@@ -1565,6 +1577,7 @@ static void executeMergeAggregatedImpl(
     bool overflow_row,
     bool final,
     bool is_remote_storage,
+    bool has_grouping_sets,
     const Settings & settings,
     const NamesAndTypesList & aggregation_keys,
     const AggregateDescriptions & aggregates)
@@ -1572,6 +1585,8 @@ static void executeMergeAggregatedImpl(
     const auto & header_before_merge = query_plan.getCurrentDataStream().header;
 
     ColumnNumbers keys;
+    if (has_grouping_sets)
+        keys.push_back(header_before_merge.getPositionByName("__grouping_set"));
     for (const auto & key : aggregation_keys)
         keys.push_back(header_before_merge.getPositionByName(key.name));
 
@@ -1674,6 +1689,7 @@ void InterpreterSelectQuery::addEmptySourceToQueryPlan(
                 query_info.projection->aggregate_overflow_row,
                 query_info.projection->aggregate_final,
                 false,
+                false,
                 context_->getSettingsRef(),
                 query_info.projection->aggregation_keys,
                 query_info.projection->aggregate_descriptions);
@@ -2165,7 +2181,6 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
     }
 }
 
-
 void InterpreterSelectQuery::executeWhere(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter)
 {
     auto where_step = std::make_unique<FilterStep>(
@@ -2175,6 +2190,80 @@ void InterpreterSelectQuery::executeWhere(QueryPlan & query_plan, const ActionsD
     query_plan.addStep(std::move(where_step));
 }
 
+static Aggregator::Params getAggregatorParams(
+    const ASTPtr & query_ptr,
+    const SelectQueryExpressionAnalyzer & query_analyzer,
+    const Context & context,
+    const Block & current_data_stream_header,
+    const ColumnNumbers & keys,
+    const AggregateDescriptions & aggregates,
+    bool overflow_row, const Settings & settings,
+    size_t group_by_two_level_threshold, size_t group_by_two_level_threshold_bytes)
+{
+    const auto stats_collecting_params = Aggregator::Params::StatsCollectingParams(
+        query_ptr,
+        settings.collect_hash_table_stats_during_aggregation,
+        settings.max_entries_for_hash_table_stats,
+        settings.max_size_to_preallocate_for_aggregation);
+
+    return Aggregator::Params{
+        current_data_stream_header,
+        keys,
+        aggregates,
+        overflow_row,
+        settings.max_rows_to_group_by,
+        settings.group_by_overflow_mode,
+        group_by_two_level_threshold,
+        group_by_two_level_threshold_bytes,
+        settings.max_bytes_before_external_group_by,
+        settings.empty_result_for_aggregation_by_empty_set
+            || (settings.empty_result_for_aggregation_by_constant_keys_on_empty_set && keys.empty()
+                && query_analyzer.hasConstAggregationKeys()),
+        context.getTemporaryVolume(),
+        settings.max_threads,
+        settings.min_free_disk_space_for_temporary_data,
+        settings.compile_aggregate_expressions,
+        settings.min_count_to_compile_aggregate_expression,
+        Block{},
+        stats_collecting_params
+    };
+}
+
+static GroupingSetsParamsList getAggregatorGroupingSetsParams(
+    const SelectQueryExpressionAnalyzer & query_analyzer,
+    const Block & header_before_aggregation,
+    const ColumnNumbers & all_keys
+)
+{
+    GroupingSetsParamsList result;
+    if (query_analyzer.useGroupingSetKey())
+    {
+        auto const & aggregation_keys_list = query_analyzer.aggregationKeysList();
+
+        ColumnNumbersList grouping_sets_with_keys;
+        ColumnNumbersList missing_columns_per_set;
+
+        for (const auto & aggregation_keys : aggregation_keys_list)
+        {
+            ColumnNumbers keys;
+            std::unordered_set<size_t> keys_set;
+            for (const auto & key : aggregation_keys)
+            {
+                keys.push_back(header_before_aggregation.getPositionByName(key.name));
+                keys_set.insert(keys.back());
+            }
+
+            ColumnNumbers missing_indexes;
+            for (size_t i = 0; i < all_keys.size(); ++i)
+            {
+                if (!keys_set.contains(all_keys[i]))
+                    missing_indexes.push_back(i);
+            }
+            result.emplace_back(std::move(keys), std::move(missing_indexes));
+        }
+    }
+    return result;
+}
 
 void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool overflow_row, bool final, InputOrderInfoPtr group_by_info)
 {
@@ -2186,9 +2275,6 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
         return;
 
     const auto & header_before_aggregation = query_plan.getCurrentDataStream().header;
-    ColumnNumbers keys;
-    for (const auto & key : query_analyzer->aggregationKeys())
-        keys.push_back(header_before_aggregation.getPositionByName(key.name));
 
     AggregateDescriptions aggregates = query_analyzer->aggregates();
     for (auto & descr : aggregates)
@@ -2198,32 +2284,14 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
 
     const Settings & settings = context->getSettingsRef();
 
-    const auto stats_collecting_params = Aggregator::Params::StatsCollectingParams(
-        query_ptr,
-        settings.collect_hash_table_stats_during_aggregation,
-        settings.max_entries_for_hash_table_stats,
-        settings.max_size_to_preallocate_for_aggregation);
+    ColumnNumbers keys;
+    for (const auto & key : query_analyzer->aggregationKeys())
+        keys.push_back(header_before_aggregation.getPositionByName(key.name));
 
-    Aggregator::Params params(
-        header_before_aggregation,
-        keys,
-        aggregates,
-        overflow_row,
-        settings.max_rows_to_group_by,
-        settings.group_by_overflow_mode,
-        settings.group_by_two_level_threshold,
-        settings.group_by_two_level_threshold_bytes,
-        settings.max_bytes_before_external_group_by,
-        settings.empty_result_for_aggregation_by_empty_set
-            || (settings.empty_result_for_aggregation_by_constant_keys_on_empty_set && keys.empty()
-                && query_analyzer->hasConstAggregationKeys()),
-        context->getTemporaryVolume(),
-        settings.max_threads,
-        settings.min_free_disk_space_for_temporary_data,
-        settings.compile_aggregate_expressions,
-        settings.min_count_to_compile_aggregate_expression,
-        Block{},
-        stats_collecting_params);
+    auto aggregator_params = getAggregatorParams(query_ptr, *query_analyzer, *context, header_before_aggregation, keys, aggregates, overflow_row, settings,
+                 settings.group_by_two_level_threshold, settings.group_by_two_level_threshold_bytes);
+
+    auto grouping_sets_params = getAggregatorGroupingSetsParams(*query_analyzer, header_before_aggregation, keys);
 
     SortDescription group_by_sort_description;
 
@@ -2241,7 +2309,8 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
 
     auto aggregating_step = std::make_unique<AggregatingStep>(
         query_plan.getCurrentDataStream(),
-        params,
+        std::move(aggregator_params),
+        std::move(grouping_sets_params),
         final,
         settings.max_block_size,
         settings.aggregation_in_order_max_block_bytes,
@@ -2250,11 +2319,10 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
         storage_has_evenly_distributed_read,
         std::move(group_by_info),
         std::move(group_by_sort_description));
-
     query_plan.addStep(std::move(aggregating_step));
 }
 
-void InterpreterSelectQuery::executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final)
+void InterpreterSelectQuery::executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final, bool has_grouping_sets)
 {
     /// If aggregate projection was chosen for table, avoid adding MergeAggregated.
     /// It is already added by storage (because of performance issues).
@@ -2268,6 +2336,7 @@ void InterpreterSelectQuery::executeMergeAggregated(QueryPlan & query_plan, bool
         overflow_row,
         final,
         storage && storage->isRemote(),
+        has_grouping_sets,
         context->getSettingsRef(),
         query_analyzer->aggregationKeys(),
         query_analyzer->aggregates());
@@ -2302,47 +2371,28 @@ void InterpreterSelectQuery::executeTotalsAndHaving(
     query_plan.addStep(std::move(totals_having_step));
 }
 
-
 void InterpreterSelectQuery::executeRollupOrCube(QueryPlan & query_plan, Modificator modificator)
 {
     const auto & header_before_transform = query_plan.getCurrentDataStream().header;
 
-    ColumnNumbers keys;
+    const Settings & settings = context->getSettingsRef();
 
+    ColumnNumbers keys;
     for (const auto & key : query_analyzer->aggregationKeys())
         keys.push_back(header_before_transform.getPositionByName(key.name));
 
-    const Settings & settings = context->getSettingsRef();
-
-    Aggregator::Params params(
-        header_before_transform,
-        keys,
-        query_analyzer->aggregates(),
-        false,
-        settings.max_rows_to_group_by,
-        settings.group_by_overflow_mode,
-        0,
-        0,
-        settings.max_bytes_before_external_group_by,
-        settings.empty_result_for_aggregation_by_empty_set,
-        context->getTemporaryVolume(),
-        settings.max_threads,
-        settings.min_free_disk_space_for_temporary_data,
-        settings.compile_aggregate_expressions,
-        settings.min_count_to_compile_aggregate_expression);
-
-    auto transform_params = std::make_shared<AggregatingTransformParams>(params, true);
+    auto params = getAggregatorParams(query_ptr, *query_analyzer, *context, header_before_transform, keys, query_analyzer->aggregates(), false, settings, 0, 0);
+    auto transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), true);
 
     QueryPlanStepPtr step;
     if (modificator == Modificator::ROLLUP)
         step = std::make_unique<RollupStep>(query_plan.getCurrentDataStream(), std::move(transform_params));
-    else
+    else if (modificator == Modificator::CUBE)
         step = std::make_unique<CubeStep>(query_plan.getCurrentDataStream(), std::move(transform_params));
 
     query_plan.addStep(std::move(step));
 }
 
-
 void InterpreterSelectQuery::executeExpression(QueryPlan & query_plan, const ActionsDAGPtr & expression, const std::string & description)
 {
     if (!expression)
@@ -2405,26 +2455,25 @@ void InterpreterSelectQuery::executeWindow(QueryPlan & query_plan)
     // Try to sort windows in such an order that the window with the longest
     // sort description goes first, and all window that use its prefixes follow.
     std::vector<const WindowDescription *> windows_sorted;
-    for (const auto & [_, w] : query_analyzer->windowDescriptions())
-        windows_sorted.push_back(&w);
+    for (const auto & [_, window] : query_analyzer->windowDescriptions())
+        windows_sorted.push_back(&window);
 
     ::sort(windows_sorted.begin(), windows_sorted.end(), windowDescriptionComparator);
 
     const Settings & settings = context->getSettingsRef();
     for (size_t i = 0; i < windows_sorted.size(); ++i)
     {
-        const auto & w = *windows_sorted[i];
+        const auto & window = *windows_sorted[i];
 
         // We don't need to sort again if the input from previous window already
         // has suitable sorting. Also don't create sort steps when there are no
         // columns to sort by, because the sort nodes are confused by this. It
         // happens in case of `over ()`.
-        if (!w.full_sort_description.empty() && (i == 0 || !sortIsPrefix(w, *windows_sorted[i - 1])))
+        if (!window.full_sort_description.empty() && (i == 0 || !sortIsPrefix(window, *windows_sorted[i - 1])))
         {
-
             auto sorting_step = std::make_unique<SortingStep>(
                 query_plan.getCurrentDataStream(),
-                w.full_sort_description,
+                window.full_sort_description,
                 settings.max_block_size,
                 0 /* LIMIT */,
                 SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode),
@@ -2433,12 +2482,12 @@ void InterpreterSelectQuery::executeWindow(QueryPlan & query_plan)
                 settings.max_bytes_before_external_sort,
                 context->getTemporaryVolume(),
                 settings.min_free_disk_space_for_temporary_data);
-            sorting_step->setStepDescription("Sorting for window '" + w.window_name + "'");
+            sorting_step->setStepDescription("Sorting for window '" + window.window_name + "'");
             query_plan.addStep(std::move(sorting_step));
         }
 
-        auto window_step = std::make_unique<WindowStep>(query_plan.getCurrentDataStream(), w, w.window_functions);
-        window_step->setStepDescription("Window step for window '" + w.window_name + "'");
+        auto window_step = std::make_unique<WindowStep>(query_plan.getCurrentDataStream(), window, window.window_functions);
+        window_step->setStepDescription("Window step for window '" + window.window_name + "'");
 
         query_plan.addStep(std::move(window_step));
     }
@@ -2510,8 +2559,7 @@ void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const So
 {
     const Settings & settings = context->getSettingsRef();
 
-    auto merging_sorted
-        = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), sort_description, settings.max_block_size, limit);
+    auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), sort_description, settings.max_block_size, limit);
 
     merging_sorted->setStepDescription("Merge sorted streams " + description);
     query_plan.addStep(std::move(merging_sorted));
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index bff2f6c4f90..3adbcad909c 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -27,6 +27,9 @@ class InterpreterSelectWithUnionQuery;
 class Context;
 class QueryPlan;
 
+struct GroupingSetsParams;
+using GroupingSetsParamsList = std::vector<GroupingSetsParams>;
+
 struct TreeRewriterResult;
 using TreeRewriterResultPtr = std::shared_ptr<const TreeRewriterResult>;
 
@@ -140,12 +143,11 @@ private:
     void executeImpl(QueryPlan & query_plan, std::optional<Pipe> prepared_pipe);
 
     /// Different stages of query execution.
-
     void executeFetchColumns(QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan);
     void executeWhere(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter);
     void executeAggregation(
         QueryPlan & query_plan, const ActionsDAGPtr & expression, bool overflow_row, bool final, InputOrderInfoPtr group_by_info);
-    void executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final);
+    void executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final, bool has_grouping_sets);
     void executeTotalsAndHaving(QueryPlan & query_plan, bool has_having, const ActionsDAGPtr & expression, bool remove_filter, bool overflow_row, bool final);
     void executeHaving(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter);
     static void executeExpression(QueryPlan & query_plan, const ActionsDAGPtr & expression, const std::string & description);
@@ -171,7 +173,7 @@ private:
     enum class Modificator
     {
         ROLLUP = 0,
-        CUBE = 1
+        CUBE = 1,
     };
 
     void executeRollupOrCube(QueryPlan & query_plan, Modificator modificator);
diff --git a/src/Interpreters/JIT/compileFunction.cpp b/src/Interpreters/JIT/compileFunction.cpp
index a820ead29b3..9d2ab40bf76 100644
--- a/src/Interpreters/JIT/compileFunction.cpp
+++ b/src/Interpreters/JIT/compileFunction.cpp
@@ -775,6 +775,133 @@ CompiledAggregateFunctions compileAggregateFunctions(CHJIT & jit, const std::vec
     return compiled_aggregate_functions;
 }
 
+CompiledSortDescriptionFunction compileSortDescription(
+    CHJIT & jit,
+    SortDescription & description,
+    const DataTypes & sort_description_types,
+    const std::string & sort_description_dump)
+{
+    Stopwatch watch;
+
+    auto compiled_module = jit.compileModule([&](llvm::Module & module)
+    {
+        auto & context = module.getContext();
+        llvm::IRBuilder<> b(context);
+
+        auto * size_type = b.getIntNTy(sizeof(size_t) * 8);
+
+        auto * column_data_type = llvm::StructType::get(b.getInt8PtrTy(), b.getInt8PtrTy());
+
+        std::vector<llvm::Type *> types = { size_type, size_type, column_data_type->getPointerTo(), column_data_type->getPointerTo() };
+        auto * comparator_func_declaration = llvm::FunctionType::get(b.getInt8Ty(), types, false);
+        auto * comparator_func = llvm::Function::Create(comparator_func_declaration, llvm::Function::ExternalLinkage, sort_description_dump, module);
+
+        auto * arguments = comparator_func->args().begin();
+        llvm::Value * lhs_index_arg = &*arguments++;
+        llvm::Value * rhs_index_arg = &*arguments++;
+        llvm::Value * columns_lhs_arg = &*arguments++;
+        llvm::Value * columns_rhs_arg = &*arguments++;
+
+        size_t columns_size = description.size();
+
+        std::vector<std::pair<llvm::BasicBlock *, llvm::Value *>> comparator_steps_and_results;
+        for (size_t i = 0; i < columns_size; ++i)
+        {
+            auto * step = llvm::BasicBlock::Create(b.getContext(), "step_" + std::to_string(i), comparator_func);
+            llvm::Value * result_value = nullptr;
+            comparator_steps_and_results.emplace_back(step, result_value);
+        }
+
+        auto * lhs_equals_rhs_result = llvm::ConstantInt::getSigned(b.getInt8Ty(), 0);
+
+        auto * comparator_join = llvm::BasicBlock::Create(b.getContext(), "comparator_join", comparator_func);
+
+        for (size_t i = 0; i < columns_size; ++i)
+        {
+            b.SetInsertPoint(comparator_steps_and_results[i].first);
+
+            const auto & sort_description = description[i];
+            const auto & column_type = sort_description_types[i];
+
+            auto dummy_column = column_type->createColumn();
+
+            auto * column_native_type_nullable = toNativeType(b, column_type);
+            auto * column_native_type = toNativeType(b, removeNullable(column_type));
+            if (!column_native_type)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "No native type for column type {}", column_type->getName());
+
+            auto * column_native_type_pointer = column_native_type->getPointerTo();
+            bool column_type_is_nullable = column_type->isNullable();
+
+            auto * nullable_unitilized = llvm::Constant::getNullValue(column_native_type_nullable);
+
+            auto * lhs_column = b.CreateLoad(column_data_type, b.CreateConstInBoundsGEP1_64(column_data_type, columns_lhs_arg, i));
+            auto * lhs_column_data = b.CreatePointerCast(b.CreateExtractValue(lhs_column, {0}), column_native_type_pointer);
+            auto * lhs_column_null_data = column_type_is_nullable ? b.CreateExtractValue(lhs_column, {1}) : nullptr;
+
+            llvm::Value * lhs_value = b.CreateLoad(b.CreateInBoundsGEP(nullptr, lhs_column_data, lhs_index_arg));
+
+            if (lhs_column_null_data)
+            {
+                auto * is_null_value_pointer = b.CreateInBoundsGEP(nullptr, lhs_column_null_data, lhs_index_arg);
+                auto * is_null = b.CreateICmpNE(b.CreateLoad(b.getInt8Ty(), is_null_value_pointer), b.getInt8(0));
+                auto * lhs_nullable_value = b.CreateInsertValue(b.CreateInsertValue(nullable_unitilized, lhs_value, {0}), is_null, {1});
+                lhs_value = lhs_nullable_value;
+            }
+
+            auto * rhs_column = b.CreateLoad(column_data_type, b.CreateConstInBoundsGEP1_64(column_data_type, columns_rhs_arg, i));
+            auto * rhs_column_data = b.CreatePointerCast(b.CreateExtractValue(rhs_column, {0}), column_native_type_pointer);
+            auto * rhs_column_null_data = column_type_is_nullable ? b.CreateExtractValue(rhs_column, {1}) : nullptr;
+
+            llvm::Value * rhs_value = b.CreateLoad(b.CreateInBoundsGEP(nullptr, rhs_column_data, rhs_index_arg));
+            if (rhs_column_null_data)
+            {
+                auto * is_null_value_pointer = b.CreateInBoundsGEP(nullptr, rhs_column_null_data, rhs_index_arg);
+                auto * is_null = b.CreateICmpNE(b.CreateLoad(b.getInt8Ty(), is_null_value_pointer), b.getInt8(0));
+                auto * rhs_nullable_value = b.CreateInsertValue(b.CreateInsertValue(nullable_unitilized, rhs_value, {0}), is_null, {1});
+                rhs_value = rhs_nullable_value;
+            }
+
+            llvm::Value * direction = llvm::ConstantInt::getSigned(b.getInt8Ty(), sort_description.direction);
+            llvm::Value * nan_direction_hint = llvm::ConstantInt::getSigned(b.getInt8Ty(), sort_description.nulls_direction);
+            llvm::Value * compare_result = dummy_column->compileComparator(b, lhs_value, rhs_value, nan_direction_hint);
+            llvm::Value * result = b.CreateMul(direction, compare_result);
+
+            comparator_steps_and_results[i].first = b.GetInsertBlock();
+            comparator_steps_and_results[i].second = result;
+
+            if (i == columns_size - 1)
+                b.CreateBr(comparator_join);
+            else
+                b.CreateCondBr(b.CreateICmpEQ(result, lhs_equals_rhs_result), comparator_steps_and_results[i + 1].first, comparator_join);
+        }
+
+        b.SetInsertPoint(comparator_join);
+        auto * phi = b.CreatePHI(b.getInt8Ty(), comparator_steps_and_results.size());
+
+        for (const auto & [block, result_value] : comparator_steps_and_results)
+            phi->addIncoming(result_value, block);
+
+        b.CreateRet(phi);
+    });
+
+    ProfileEvents::increment(ProfileEvents::CompileExpressionsMicroseconds, watch.elapsedMicroseconds());
+    ProfileEvents::increment(ProfileEvents::CompileExpressionsBytes, compiled_module.size);
+    ProfileEvents::increment(ProfileEvents::CompileFunction);
+
+    auto comparator_function = reinterpret_cast<JITSortDescriptionFunc>(compiled_module.function_name_to_symbol[sort_description_dump]);
+    assert(comparator_function);
+
+    CompiledSortDescriptionFunction compiled_sort_descriptor_function
+    {
+        .comparator_function = comparator_function,
+
+        .compiled_module = std::move(compiled_module)
+    };
+
+    return compiled_sort_descriptor_function;
+}
+
 }
 
 #endif
diff --git a/src/Interpreters/JIT/compileFunction.h b/src/Interpreters/JIT/compileFunction.h
index f523bf5b970..bcd82ae8bab 100644
--- a/src/Interpreters/JIT/compileFunction.h
+++ b/src/Interpreters/JIT/compileFunction.h
@@ -4,10 +4,12 @@
 
 #if USE_EMBEDDED_COMPILER
 
+#include <Core/SortDescription.h>
 #include <Functions/IFunction.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <Interpreters/JIT/CHJIT.h>
 
+
 namespace DB
 {
 
@@ -83,6 +85,21 @@ struct CompiledAggregateFunctions
   */
 CompiledAggregateFunctions compileAggregateFunctions(CHJIT & jit, const std::vector<AggregateFunctionWithOffset> & functions, std::string functions_dump_name);
 
+
+using JITSortDescriptionFunc = int8_t (*)(size_t, size_t, ColumnData *, ColumnData *);
+
+struct CompiledSortDescriptionFunction
+{
+    JITSortDescriptionFunc comparator_function;
+    CHJIT::CompiledModule compiled_module;
+};
+
+CompiledSortDescriptionFunction compileSortDescription(
+    CHJIT & jit,
+    SortDescription & description,
+    const DataTypes & sort_description_types,
+    const std::string & sort_description_dump);
+
 }
 
 #endif
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 81603d6626d..d0bf4939c90 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -590,7 +590,7 @@ void MergeJoin::mergeInMemoryRightBlocks()
 
     /// TODO: there should be no split keys by blocks for RIGHT|FULL JOIN
     builder.addTransform(std::make_shared<MergeSortingTransform>(
-        builder.getHeader(), right_sort_description, max_rows_in_right_block, 0, 0, 0, 0, nullptr, 0));
+        builder.getHeader(), right_sort_description, max_rows_in_right_block, 0, false, 0, 0, 0, nullptr, 0));
 
     auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
     PullingPipelineExecutor executor(pipeline);
diff --git a/src/Interpreters/TransactionVersionMetadata.cpp b/src/Interpreters/TransactionVersionMetadata.cpp
index 07efa8a331b..b965ade8d10 100644
--- a/src/Interpreters/TransactionVersionMetadata.cpp
+++ b/src/Interpreters/TransactionVersionMetadata.cpp
@@ -144,7 +144,7 @@ bool VersionMetadata::isRemovalTIDLocked() const
 
 void VersionMetadata::setCreationTID(const TransactionID & tid, TransactionInfoContext * context)
 {
-    /// NOTE ReplicatedMergeTreeBlockOutputStream may add one part multiple times
+    /// NOTE ReplicatedMergeTreeSink may add one part multiple times
     assert(creation_tid.isEmpty() || creation_tid == tid);
     creation_tid = tid;
     if (context)
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 19041a19aa4..b8a31dd968b 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -210,10 +210,22 @@ GroupByKeysInfo getGroupByKeysInfo(const ASTs & group_by_keys)
     /// filling set with short names of keys
     for (const auto & group_key : group_by_keys)
     {
-        if (group_key->as<ASTFunction>())
-            data.has_function = true;
+        /// for grouping sets case
+        if (group_key->as<ASTExpressionList>())
+        {
+            const auto express_list_ast = group_key->as<const ASTExpressionList &>();
+            for (const auto & group_elem : express_list_ast.children)
+            {
+                data.key_names.insert(group_elem->getColumnName());
+            }
+        }
+        else
+        {
+            if (group_key->as<ASTFunction>())
+                data.has_function = true;
 
-        data.key_names.insert(group_key->getColumnName());
+            data.key_names.insert(group_key->getColumnName());
+        }
     }
 
     return data;
@@ -646,12 +658,6 @@ void optimizeSumIfFunctions(ASTPtr & query)
     RewriteSumIfFunctionVisitor(data).visit(query);
 }
 
-void optimizeCountConstantAndSumOne(ASTPtr & query)
-{
-    RewriteCountVariantsVisitor::visit(query);
-}
-
-
 void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, ContextPtr context)
 {
     RemoveInjectiveFunctionsVisitor::Data data(context);
@@ -740,6 +746,11 @@ void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_
         OptimizeIfChainsVisitor().visit(query);
 }
 
+void TreeOptimizer::optimizeCountConstantAndSumOne(ASTPtr & query)
+{
+    RewriteCountVariantsVisitor::visit(query);
+}
+
 void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
                           const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns, ContextPtr context)
 {
diff --git a/src/Interpreters/TreeOptimizer.h b/src/Interpreters/TreeOptimizer.h
index 1d9a29bd0ac..ced185373cc 100644
--- a/src/Interpreters/TreeOptimizer.h
+++ b/src/Interpreters/TreeOptimizer.h
@@ -24,6 +24,7 @@ public:
         ContextPtr context);
 
     static void optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif);
+    static void optimizeCountConstantAndSumOne(ASTPtr & query);
 };
 
 }
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 9a00c0e7135..c90421d6f4f 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -1151,6 +1151,10 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     if (remove_duplicates)
         renameDuplicatedColumns(select_query);
 
+    /// Perform it before analyzing JOINs, because it may change number of columns with names unique and break some login inside JOINs
+    if (settings.optimize_normalize_count_variants)
+        TreeOptimizer::optimizeCountConstantAndSumOne(query);
+
     if (tables_with_columns.size() > 1)
     {
         const auto & right_table = tables_with_columns[1];
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 52c84535050..b280d98b5d3 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -275,7 +275,7 @@ DDLQueryStatusSource::DDLQueryStatusSource(
     , node_path(zk_node_path)
     , context(context_)
     , watch(CLOCK_MONOTONIC_COARSE)
-    , log(&Poco::Logger::get("DDLQueryStatusInputStream"))
+    , log(&Poco::Logger::get("DDLQueryStatusSource"))
 {
     auto output_mode = context->getSettingsRef().distributed_ddl_output_mode;
     throw_on_timeout = output_mode == DistributedDDLOutputMode::THROW || output_mode == DistributedDDLOutputMode::NONE;
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 015b0c16d47..d1596c08318 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -821,7 +821,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 element.profile_counters = info.profile_counters;
 
                 /// We need to refresh the access info since dependent views might have added extra information, either during
-                /// creation of the view (PushingToViewsBlockOutputStream) or while executing its internal SELECT
+                /// creation of the view (PushingToViews chain) or while executing its internal SELECT
                 const auto & access_info = context_ptr->getQueryAccessInfo();
                 element.query_databases.insert(access_info.databases.begin(), access_info.databases.end());
                 element.query_tables.insert(access_info.tables.begin(), access_info.tables.end());
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index 522244d76f0..37f46d6a65e 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -597,41 +597,29 @@ NotJoinedBlocks::NotJoinedBlocks(std::unique_ptr<RightColumnsFiller> filler_,
             column_indices_left.emplace_back(left_pos);
     }
 
-    /// `sample_block_names` may contain non unique column names
+    /// `saved_block_sample` may contains non unique column names, get any of them
     /// (e.g. in case of `... JOIN (SELECT a, a, b FROM table) as t2`)
-    /// proper fix is to get rid of it
-    std::unordered_set<String> sample_block_names;
-    for (size_t right_pos = 0; right_pos < saved_block_sample.columns(); ++right_pos)
+    for (const auto & [name, right_pos] : saved_block_sample.getNamesToIndexesMap())
     {
-        const String & name = saved_block_sample.getByPosition(right_pos).name;
-
-        auto [_, inserted] = sample_block_names.insert(name);
-        /// skip columns with same names
-        if (!inserted)
-            continue;
-
-        if (!result_sample_block.has(name))
-            continue;
-
-        size_t result_position = result_sample_block.getPositionByName(name);
-
-        /// Don't remap left keys twice. We need only qualified right keys here
-        if (result_position < left_columns_count)
-            continue;
-
-        setRightIndex(right_pos, result_position);
+        /// Start from left_columns_count to don't remap left keys twice. We need only qualified right keys here
+        /// `result_sample_block` may contains non unique column names, need to set index for all of them
+        for (size_t result_pos = left_columns_count; result_pos < result_sample_block.columns(); ++result_pos)
+        {
+            const auto & result_name = result_sample_block.getByPosition(result_pos).name;
+            if (result_name == name)
+                setRightIndex(right_pos, result_pos);
+        }
     }
 
-    /// `result_sample_block` also may contains non unique column names
-    const auto & result_names = result_sample_block.getNames();
-    size_t unique_names_count = std::unordered_set<String>(result_names.begin(), result_names.end()).size();
-    if (column_indices_left.size() + column_indices_right.size() + same_result_keys.size() != unique_names_count)
+    if (column_indices_left.size() + column_indices_right.size() + same_result_keys.size() != result_sample_block.columns())
+    {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
-            "Error in columns mapping in JOIN. (assertion failed {} + {} + {} != {}) "
+            "Error in columns mapping in JOIN: assertion failed {} + {} + {} != {}; "
             "Result block [{}], Saved block [{}]",
-            column_indices_left.size(), column_indices_right.size(), same_result_keys.size(), unique_names_count,
+            column_indices_left.size(), column_indices_right.size(), same_result_keys.size(), result_sample_block.columns(),
             result_sample_block.dumpNames(), saved_block_sample.dumpNames());
+    }
 }
 
 void NotJoinedBlocks::setRightIndex(size_t right_pos, size_t result_position)
diff --git a/src/Parsers/ASTExpressionList.cpp b/src/Parsers/ASTExpressionList.cpp
index 2724465537f..2590c6b2941 100644
--- a/src/Parsers/ASTExpressionList.cpp
+++ b/src/Parsers/ASTExpressionList.cpp
@@ -26,7 +26,15 @@ void ASTExpressionList::formatImpl(const FormatSettings & settings, FormatState
             settings.ostr << ' ';
         }
 
-        (*it)->formatImpl(settings, state, frame);
+        if (frame.surround_each_list_element_with_parens)
+            settings.ostr << "(";
+
+        FormatStateStacked frame_nested = frame;
+        frame_nested.surround_each_list_element_with_parens = false;
+        (*it)->formatImpl(settings, state, frame_nested);
+
+        if (frame.surround_each_list_element_with_parens)
+            settings.ostr << ")";
     }
 }
 
@@ -41,6 +49,7 @@ void ASTExpressionList::formatImplMultiline(const FormatSettings & settings, For
     }
 
     ++frame.indent;
+
     for (ASTs::const_iterator it = children.begin(); it != children.end(); ++it)
     {
         if (it != children.begin())
@@ -54,7 +63,15 @@ void ASTExpressionList::formatImplMultiline(const FormatSettings & settings, For
 
         FormatStateStacked frame_nested = frame;
         frame_nested.expression_list_always_start_on_new_line = false;
+        frame_nested.surround_each_list_element_with_parens = false;
+
+        if (frame.surround_each_list_element_with_parens)
+            settings.ostr << "(";
+
         (*it)->formatImpl(settings, state, frame_nested);
+
+        if (frame.surround_each_list_element_with_parens)
+            settings.ostr << ")";
     }
 }
 
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 43186056077..4408fd21465 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -96,9 +96,12 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
     if (groupBy())
     {
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "GROUP BY" << (s.hilite ? hilite_none : "");
-        s.one_line
+        if (!group_by_with_grouping_sets)
+        {
+            s.one_line
             ? groupBy()->formatImpl(s, state, frame)
             : groupBy()->as<ASTExpressionList &>().formatImplMultiline(s, state, frame);
+        }
     }
 
     if (group_by_with_rollup)
@@ -107,6 +110,18 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
     if (group_by_with_cube)
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH CUBE" << (s.hilite ? hilite_none : "");
 
+    if (group_by_with_grouping_sets)
+    {
+        frame.surround_each_list_element_with_parens = true;
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "GROUPING SETS" << (s.hilite ? hilite_none : "");
+        s.ostr << " (";
+        s.one_line
+        ? groupBy()->formatImpl(s, state, frame)
+        : groupBy()->as<ASTExpressionList &>().formatImplMultiline(s, state, frame);
+        s.ostr << ")";
+        frame.surround_each_list_element_with_parens = false;
+    }
+
     if (group_by_with_totals)
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH TOTALS" << (s.hilite ? hilite_none : "");
 
diff --git a/src/Parsers/ASTSelectQuery.h b/src/Parsers/ASTSelectQuery.h
index 4a30d6afee3..704aeeeea7c 100644
--- a/src/Parsers/ASTSelectQuery.h
+++ b/src/Parsers/ASTSelectQuery.h
@@ -86,6 +86,7 @@ public:
     bool group_by_with_rollup = false;
     bool group_by_with_cube = false;
     bool group_by_with_constant_keys = false;
+    bool group_by_with_grouping_sets = false;
     bool limit_with_ties = false;
 
     ASTPtr & refSelect()    { return getExpression(Expression::SELECT); }
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index fd19e2166df..8a7891edfe1 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -181,6 +181,10 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &,
         else if (!disk.empty())
             print_identifier(disk);
     }
+    else if (type == Type::SYNC_DATABASE_REPLICA)
+    {
+        print_identifier(database->as<ASTIdentifier>()->name());
+    }
     else if (type == Type::DROP_REPLICA)
     {
         print_drop_replica();
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index 8f5d1fa4dda..caf9be1fea6 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -755,13 +755,61 @@ bool ParserNotEmptyExpressionList::parseImpl(Pos & pos, ASTPtr & node, Expected
     return nested_parser.parse(pos, node, expected) && !node->children.empty();
 }
 
-
 bool ParserOrderByExpressionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     return ParserList(std::make_unique<ParserOrderByElement>(), std::make_unique<ParserToken>(TokenType::Comma), false)
         .parse(pos, node, expected);
 }
 
+bool ParserGroupingSetsExpressionListElements::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    auto command_list = std::make_shared<ASTExpressionList>();
+    node = command_list;
+
+    ParserToken s_comma(TokenType::Comma);
+    ParserToken s_open(TokenType::OpeningRoundBracket);
+    ParserToken s_close(TokenType::ClosingRoundBracket);
+    ParserExpressionWithOptionalAlias p_expression(false);
+    ParserList p_command(std::make_unique<ParserExpressionWithOptionalAlias>(false),
+                          std::make_unique<ParserToken>(TokenType::Comma), true);
+
+    do
+    {
+        Pos begin = pos;
+        ASTPtr command;
+        if (!s_open.ignore(pos, expected))
+        {
+            pos = begin;
+            if (!p_expression.parse(pos, command, expected))
+            {
+                return false;
+            }
+            auto list = std::make_shared<ASTExpressionList>(',');
+            list->children.push_back(command);
+            command = std::move(list);
+        }
+        else
+        {
+            if (!p_command.parse(pos, command, expected))
+                return false;
+
+            if (!s_close.ignore(pos, expected))
+                break;
+        }
+
+        command_list->children.push_back(command);
+    }
+    while (s_comma.ignore(pos, expected));
+
+    return true;
+}
+
+bool ParserGroupingSetsExpressionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserGroupingSetsExpressionListElements grouping_sets_elements;
+    return grouping_sets_elements.parse(pos, node, expected);
+
+}
 
 bool ParserInterpolateExpressionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index 2325433a00a..2b127dc2607 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -517,6 +517,20 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+class ParserGroupingSetsExpressionList : public IParserBase
+{
+protected:
+    const char * getName() const override { return "grouping sets expression"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+class ParserGroupingSetsExpressionListElements : public IParserBase
+{
+protected:
+    const char * getName() const override { return "grouping sets expression elements"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 class ParserInterpolateExpressionList : public IParserBase
 {
 protected:
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index bd8167c64fe..b73919f4f36 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -224,6 +224,7 @@ public:
         bool need_parens = false;
         bool expression_list_always_start_on_new_line = false;  /// Line feed and indent before expression list even if it's of single element.
         bool expression_list_prepend_whitespace = false; /// Prepend whitespace (if it is required)
+        bool surround_each_list_element_with_parens = false;
         const IAST * current_select = nullptr;
     };
 
diff --git a/src/Parsers/ParserSelectQuery.cpp b/src/Parsers/ParserSelectQuery.cpp
index 4e9d5c1d57d..66428b144bf 100644
--- a/src/Parsers/ParserSelectQuery.cpp
+++ b/src/Parsers/ParserSelectQuery.cpp
@@ -54,6 +54,7 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword s_by("BY");
     ParserKeyword s_rollup("ROLLUP");
     ParserKeyword s_cube("CUBE");
+    ParserKeyword s_grouping_sets("GROUPING SETS");
     ParserKeyword s_top("TOP");
     ParserKeyword s_with_ties("WITH TIES");
     ParserKeyword s_offset("OFFSET");
@@ -70,6 +71,7 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserNotEmptyExpressionList exp_list_for_select_clause(true);    /// Allows aliases without AS keyword.
     ParserExpressionWithOptionalAlias exp_elem(false);
     ParserOrderByExpressionList order_list;
+    ParserGroupingSetsExpressionList grouping_sets_list;
     ParserInterpolateExpressionList interpolate_list;
 
     ParserToken open_bracket(TokenType::OpeningRoundBracket);
@@ -191,24 +193,39 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             select_query->group_by_with_rollup = true;
         else if (s_cube.ignore(pos, expected))
             select_query->group_by_with_cube = true;
+        else if (s_grouping_sets.ignore(pos, expected))
+            select_query->group_by_with_grouping_sets = true;
 
-        if ((select_query->group_by_with_rollup || select_query->group_by_with_cube) && !open_bracket.ignore(pos, expected))
+        if ((select_query->group_by_with_rollup || select_query->group_by_with_cube || select_query->group_by_with_grouping_sets) &&
+            !open_bracket.ignore(pos, expected))
             return false;
 
-        if (!exp_list.parse(pos, group_expression_list, expected))
-            return false;
+        if (select_query->group_by_with_grouping_sets)
+        {
+            if (!grouping_sets_list.parse(pos, group_expression_list, expected))
+                return false;
+        }
+        else
+        {
+            if (!exp_list.parse(pos, group_expression_list, expected))
+                return false;
+        }
 
-        if ((select_query->group_by_with_rollup || select_query->group_by_with_cube) && !close_bracket.ignore(pos, expected))
+
+        if ((select_query->group_by_with_rollup || select_query->group_by_with_cube || select_query->group_by_with_grouping_sets) &&
+            !close_bracket.ignore(pos, expected))
             return false;
     }
 
-    /// WITH ROLLUP, CUBE or TOTALS
+    /// WITH ROLLUP, CUBE, GROUPING SETS or TOTALS
     if (s_with.ignore(pos, expected))
     {
         if (s_rollup.ignore(pos, expected))
             select_query->group_by_with_rollup = true;
         else if (s_cube.ignore(pos, expected))
             select_query->group_by_with_cube = true;
+        else if (s_grouping_sets.ignore(pos, expected))
+            select_query->group_by_with_grouping_sets = true;
         else if (s_totals.ignore(pos, expected))
             select_query->group_by_with_totals = true;
         else
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 5e4c3b96e46..599de6ec828 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -247,6 +247,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
 
         case Type::SYNC_DATABASE_REPLICA:
         {
+            parseQueryWithOnCluster(res, pos, expected);
             if (!parseDatabaseAsAST(pos, expected, res->database))
                 return false;
             break;
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 043e4f1e724..3f6a36e8e8c 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -717,9 +717,7 @@ namespace DB
                 column.type = recursiveRemoveLowCardinality(column.type);
                 column.column = recursiveRemoveLowCardinality(column.column);
             }
-            bool is_column_nullable = false;
-            auto arrow_type = getArrowType(column.type, column.column, column.name, format_name, &is_column_nullable);
-            arrow_fields.emplace_back(std::make_shared<arrow::Field>(column.name, arrow_type, is_column_nullable));
+
             header_columns.emplace_back(std::move(column));
         }
     }
@@ -740,6 +738,13 @@ namespace DB
             if (!low_cardinality_as_dictionary)
                 column = recursiveRemoveLowCardinality(column);
 
+            if (!is_arrow_fields_initialized)
+            {
+                bool is_column_nullable = false;
+                auto arrow_type = getArrowType(header_column.type, column, header_column.name, format_name, &is_column_nullable);
+                arrow_fields.emplace_back(std::make_shared<arrow::Field>(header_column.name, arrow_type, is_column_nullable));
+            }
+
             arrow::MemoryPool* pool = arrow::default_memory_pool();
             std::unique_ptr<arrow::ArrayBuilder> array_builder;
             arrow::Status status = MakeBuilder(pool, arrow_fields[column_i]->type(), &array_builder);
@@ -757,6 +762,7 @@ namespace DB
         std::shared_ptr<arrow::Schema> arrow_schema = std::make_shared<arrow::Schema>(arrow_fields);
 
         res = arrow::Table::Make(arrow_schema, arrow_arrays);
+        is_arrow_fields_initialized = true;
     }
 }
 
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
index 1fb2a8af65e..50de8045d5f 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
@@ -27,6 +27,11 @@ private:
     /// To avoid converting dictionary from LowCardinality to Arrow
     /// Dictionary every chunk we save it and reuse.
     std::unordered_map<std::string, std::shared_ptr<arrow::Array>> dictionary_values;
+
+    /// We should initialize arrow fields on first call of chChunkToArrowTable, not in constructor
+    /// because LowCardinality column from header always has indexes type UInt8, so, we should get
+    /// proper indexes type from first chunk of data.
+    bool is_arrow_fields_initialized = false;
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
index 1765615f9d1..c5a72bf66bc 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
@@ -1,6 +1,8 @@
 #include <Processors/Merges/Algorithms/MergingSortedAlgorithm.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromString.h>
 
 namespace DB
 {
@@ -22,11 +24,21 @@ MergingSortedAlgorithm::MergingSortedAlgorithm(
     , merged_data(header.cloneEmptyColumns(), use_average_block_sizes, max_block_size)
     , description(std::move(description_))
     , limit(limit_)
-    , has_collation(std::any_of(description.begin(), description.end(), [](const auto & descr) { return descr.collator != nullptr; }))
     , out_row_sources_buf(out_row_sources_buf_)
     , current_inputs(num_inputs)
     , cursors(num_inputs)
 {
+    DataTypes sort_description_types;
+    sort_description_types.reserve(description.size());
+
+    /// Replace column names in description to positions.
+    for (auto & column_description : description)
+    {
+        has_collation |= column_description.collator != nullptr;
+        sort_description_types.emplace_back(header.getByName(column_description.column_name).type);
+    }
+
+    compileSortDescriptionIfNeeded(description, sort_description_types, true /*increase_compile_attemps*/);
 }
 
 void MergingSortedAlgorithm::addInput()
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
index dc4270d4041..ee7784b7d9f 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
@@ -637,7 +637,7 @@ void SummingSortedAlgorithm::SummingMergedData::addRowImpl(ColumnRawPtrs & raw_c
     for (auto & desc : def.columns_to_aggregate)
     {
         if (!desc.created)
-            throw Exception("Logical error in SummingSortedBlockInputStream, there are no description",
+            throw Exception("Logical error in SummingSortedAlgorithm, there are no description",
                             ErrorCodes::LOGICAL_ERROR);
 
         if (desc.is_agg_func_type)
diff --git a/src/Processors/Merges/IMergingTransform.cpp b/src/Processors/Merges/IMergingTransform.cpp
index cdb18f07e4d..f09c7c5339f 100644
--- a/src/Processors/Merges/IMergingTransform.cpp
+++ b/src/Processors/Merges/IMergingTransform.cpp
@@ -131,7 +131,7 @@ IProcessor::Status IMergingTransformBase::prepare()
         return Status::Finished;
     }
 
-    /// Do not disable inputs, so it will work in the same way as with AsynchronousBlockInputStream, like before.
+    /// Do not disable inputs, so they can be executed in parallel.
     bool is_port_full = !output.canPush();
 
     /// Push if has data.
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index 081e7b0cc91..d7d62d07d92 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -1,10 +1,18 @@
+#include <cassert>
+#include <cstddef>
+#include <memory>
 #include <Processors/QueryPlan/AggregatingStep.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Transforms/CopyTransform.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Merges/AggregatingSortedTransform.h>
 #include <Processors/Merges/FinishAggregatingInOrderTransform.h>
+#include <Interpreters/Aggregator.h>
+#include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {
@@ -25,9 +33,28 @@ static ITransformingStep::Traits getTraits()
     };
 }
 
+static Block appendGroupingColumn(Block block, const GroupingSetsParamsList & params)
+{
+    if (params.empty())
+        return block;
+
+    Block res;
+
+    size_t rows = block.rows();
+    auto column = ColumnUInt64::create(rows);
+
+    res.insert({ColumnPtr(std::move(column)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
+
+    for (auto & col : block)
+        res.insert(std::move(col));
+
+    return res;
+}
+
 AggregatingStep::AggregatingStep(
     const DataStream & input_stream_,
     Aggregator::Params params_,
+    GroupingSetsParamsList grouping_sets_params_,
     bool final_,
     size_t max_block_size_,
     size_t aggregation_in_order_max_block_bytes_,
@@ -36,8 +63,9 @@ AggregatingStep::AggregatingStep(
     bool storage_has_evenly_distributed_read_,
     InputOrderInfoPtr group_by_info_,
     SortDescription group_by_sort_description_)
-    : ITransformingStep(input_stream_, params_.getHeader(final_), getTraits(), false)
+    : ITransformingStep(input_stream_, appendGroupingColumn(params_.getHeader(final_), grouping_sets_params_), getTraits(), false)
     , params(std::move(params_))
+    , grouping_sets_params(std::move(grouping_sets_params_))
     , final(std::move(final_))
     , max_block_size(max_block_size_)
     , aggregation_in_order_max_block_bytes(aggregation_in_order_max_block_bytes_)
@@ -49,7 +77,7 @@ AggregatingStep::AggregatingStep(
 {
 }
 
-void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
     QueryPipelineProcessorsCollector collector(pipeline, this);
 
@@ -80,6 +108,150 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
       */
     auto transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), final);
 
+    if (!grouping_sets_params.empty())
+    {
+        const size_t grouping_sets_size = grouping_sets_params.size();
+
+        const size_t streams = pipeline.getNumStreams();
+
+        auto input_header = pipeline.getHeader();
+        pipeline.transform([&](OutputPortRawPtrs ports)
+        {
+            Processors copiers;
+            copiers.reserve(ports.size());
+
+            for (auto * port : ports)
+            {
+                auto copier = std::make_shared<CopyTransform>(input_header, grouping_sets_size);
+                connect(*port, copier->getInputPort());
+                copiers.push_back(copier);
+            }
+
+            return copiers;
+        });
+
+        pipeline.transform([&](OutputPortRawPtrs ports)
+        {
+            assert(streams * grouping_sets_size == ports.size());
+            Processors processors;
+            for (size_t i = 0; i < grouping_sets_size; ++i)
+            {
+                Aggregator::Params params_for_set
+                {
+                    transform_params->params.src_header,
+                    grouping_sets_params[i].used_keys,
+                    transform_params->params.aggregates,
+                    transform_params->params.overflow_row,
+                    transform_params->params.max_rows_to_group_by,
+                    transform_params->params.group_by_overflow_mode,
+                    transform_params->params.group_by_two_level_threshold,
+                    transform_params->params.group_by_two_level_threshold_bytes,
+                    transform_params->params.max_bytes_before_external_group_by,
+                    transform_params->params.empty_result_for_aggregation_by_empty_set,
+                    transform_params->params.tmp_volume,
+                    transform_params->params.max_threads,
+                    transform_params->params.min_free_disk_space,
+                    transform_params->params.compile_aggregate_expressions,
+                    transform_params->params.min_count_to_compile_aggregate_expression,
+                    transform_params->params.intermediate_header,
+                    transform_params->params.stats_collecting_params
+                };
+                auto transform_params_for_set = std::make_shared<AggregatingTransformParams>(std::move(params_for_set), final);
+
+                if (streams > 1)
+                {
+                    auto many_data = std::make_shared<ManyAggregatedData>(streams);
+                    for (size_t j = 0; j < streams; ++j)
+                    {
+                        auto aggregation_for_set = std::make_shared<AggregatingTransform>(input_header, transform_params_for_set, many_data, j, merge_threads, temporary_data_merge_threads);
+                        // For each input stream we have `grouping_sets_size` copies, so port index
+                        // for transform #j should skip ports of first (j-1) streams.
+                        connect(*ports[i + grouping_sets_size * j], aggregation_for_set->getInputs().front());
+                        ports[i + grouping_sets_size * j] = &aggregation_for_set->getOutputs().front();
+                        processors.push_back(aggregation_for_set);
+                    }
+                }
+                else
+                {
+                    auto aggregation_for_set = std::make_shared<AggregatingTransform>(input_header, transform_params_for_set);
+                    connect(*ports[i], aggregation_for_set->getInputs().front());
+                    ports[i] = &aggregation_for_set->getOutputs().front();
+                    processors.push_back(aggregation_for_set);
+                }
+            }
+
+            if (streams > 1)
+            {
+                OutputPortRawPtrs new_ports;
+                new_ports.reserve(grouping_sets_size);
+
+                for (size_t i = 0; i < grouping_sets_size; ++i)
+                {
+                    size_t output_it = i;
+                    auto resize = std::make_shared<ResizeProcessor>(ports[output_it]->getHeader(), streams, 1);
+                    auto & inputs = resize->getInputs();
+
+                    for (auto input_it = inputs.begin(); input_it != inputs.end(); output_it += grouping_sets_size, ++input_it)
+                        connect(*ports[output_it], *input_it);
+                    new_ports.push_back(&resize->getOutputs().front());
+                    processors.push_back(resize);
+                }
+
+                ports.swap(new_ports);
+            }
+
+            assert(ports.size() == grouping_sets_size);
+            auto output_header = transform_params->getHeader();
+
+            for (size_t set_counter = 0; set_counter < grouping_sets_size; ++set_counter)
+            {
+                auto & header = ports[set_counter]->getHeader();
+
+                /// Here we create a DAG which fills missing keys and adds `__grouping_set` column
+                auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
+                ActionsDAG::NodeRawConstPtrs index;
+                index.reserve(output_header.columns() + 1);
+
+                auto grouping_col = ColumnConst::create(ColumnUInt64::create(1, set_counter), 0);
+                const auto * grouping_node = &dag->addColumn(
+                    {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
+
+                grouping_node = &dag->materializeNode(*grouping_node);
+                index.push_back(grouping_node);
+
+                size_t missign_column_index = 0;
+                const auto & missing_columns = grouping_sets_params[set_counter].missing_keys;
+
+                for (size_t i = 0; i < output_header.columns(); ++i)
+                {
+                    auto & col = output_header.getByPosition(i);
+                    if (missign_column_index < missing_columns.size() && missing_columns[missign_column_index] == i)
+                    {
+                        ++missign_column_index;
+                        auto column = ColumnConst::create(col.column->cloneResized(1), 0);
+                        const auto * node = &dag->addColumn({ColumnPtr(std::move(column)), col.type, col.name});
+                        node = &dag->materializeNode(*node);
+                        index.push_back(node);
+                    }
+                    else
+                        index.push_back(dag->getIndex()[header.getPositionByName(col.name)]);
+                }
+
+                dag->getIndex().swap(index);
+                auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
+                auto transform = std::make_shared<ExpressionTransform>(header, expression);
+
+                connect(*ports[set_counter], transform->getInputPort());
+                processors.emplace_back(std::move(transform));
+            }
+
+            return processors;
+        });
+
+        aggregating = collector.detachProcessors(0);
+        return;
+    }
+
     if (group_by_info)
     {
         if (pipeline.getNumStreams() > 1)
@@ -170,8 +342,6 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
     }
     else
     {
-        pipeline.resize(1);
-
         pipeline.addSimpleTransform([&](const Block & header)
         {
             return std::make_shared<AggregatingTransform>(header, transform_params);
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index 154ff0abc0a..b933daaa474 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -10,6 +10,21 @@ namespace DB
 struct AggregatingTransformParams;
 using AggregatingTransformParamsPtr = std::shared_ptr<AggregatingTransformParams>;
 
+struct GroupingSetsParams
+{
+    GroupingSetsParams() = default;
+
+    GroupingSetsParams(ColumnNumbers used_keys_, ColumnNumbers missing_keys_)
+        : used_keys(std::move(used_keys_))
+        , missing_keys(std::move(missing_keys_))
+    {}
+
+    ColumnNumbers used_keys;
+    ColumnNumbers missing_keys;
+};
+
+using GroupingSetsParamsList = std::vector<GroupingSetsParams>;
+
 /// Aggregation. See AggregatingTransform.
 class AggregatingStep : public ITransformingStep
 {
@@ -17,6 +32,7 @@ public:
     AggregatingStep(
         const DataStream & input_stream_,
         Aggregator::Params params_,
+        GroupingSetsParamsList grouping_sets_params_,
         bool final_,
         size_t max_block_size_,
         size_t aggregation_in_order_max_block_bytes_,
@@ -39,6 +55,7 @@ public:
 
 private:
     Aggregator::Params params;
+    GroupingSetsParamsList grouping_sets_params;
     bool final;
     size_t max_block_size;
     size_t aggregation_in_order_max_block_bytes;
@@ -55,7 +72,6 @@ private:
     Processors finalizing;
 
     Processors aggregating;
-
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 0d919c6431c..feb4a7d50f3 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -524,6 +524,9 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
         const auto & sorting_columns = metadata_for_reading->getSortingKey().column_names;
 
         SortDescription sort_description;
+        sort_description.compile_sort_description = settings.compile_sort_description;
+        sort_description.min_count_to_compile_sort_description = settings.min_count_to_compile_sort_description;
+
         for (size_t j = 0; j < prefix_size; ++j)
             sort_description.emplace_back(sorting_columns[j], input_order_info->direction);
 
@@ -763,6 +766,9 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
 
         Names sort_columns = metadata_for_reading->getSortingKeyColumns();
         SortDescription sort_description;
+        sort_description.compile_sort_description = settings.compile_sort_description;
+        sort_description.min_count_to_compile_sort_description = settings.min_count_to_compile_sort_description;
+
         size_t sort_columns_size = sort_columns.size();
         sort_description.reserve(sort_columns_size);
 
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 255beebbdf1..2d8fcf3d6cc 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -140,11 +140,21 @@ void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
                 return std::make_shared<PartialSortingTransform>(header, result_description, limit);
             });
 
+            bool increase_sort_description_compile_attempts = true;
+
             /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
-            pipeline.addSimpleTransform([&](const Block & header) -> ProcessorPtr
+            pipeline.addSimpleTransform([&, increase_sort_description_compile_attempts](const Block & header) mutable -> ProcessorPtr
             {
+                /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan
+                  * To property support min_count_to_compile_sort_description.
+                  */
+                bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
+
+                if (increase_sort_description_compile_attempts)
+                    increase_sort_description_compile_attempts = false;
+
                 return std::make_shared<FinishSortingTransform>(
-                    header, prefix_description, result_description, max_block_size, limit);
+                    header, prefix_description, result_description, max_block_size, limit, increase_sort_description_compile_attempts_current);
             });
         }
     }
@@ -171,13 +181,23 @@ void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
             return transform;
         });
 
-        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+        bool increase_sort_description_compile_attempts = true;
+
+        pipeline.addSimpleTransform([&, increase_sort_description_compile_attempts](const Block & header, QueryPipelineBuilder::StreamType stream_type) mutable -> ProcessorPtr
         {
             if (stream_type == QueryPipelineBuilder::StreamType::Totals)
                 return nullptr;
 
+            /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan.
+              * To property support min_count_to_compile_sort_description.
+              */
+            bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
+
+            if (increase_sort_description_compile_attempts)
+                increase_sort_description_compile_attempts = false;
+
             return std::make_shared<MergeSortingTransform>(
-                    header, result_description, max_block_size, limit,
+                    header, result_description, max_block_size, limit, increase_sort_description_compile_attempts_current,
                     max_bytes_before_remerge / pipeline.getNumStreams(),
                     remerge_lowered_memory_bytes_ratio,
                     max_bytes_before_external_sort,
@@ -188,12 +208,12 @@ void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
         /// If there are several streams, then we merge them into one
         if (pipeline.getNumStreams() > 1)
         {
-
             auto transform = std::make_shared<MergingSortedTransform>(
                     pipeline.getHeader(),
                     pipeline.getNumStreams(),
                     result_description,
-                    max_block_size, limit);
+                    max_block_size,
+                    limit);
 
             pipeline.addTransform(std::move(transform));
         }
@@ -202,12 +222,12 @@ void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const Build
     {        /// If there are several streams, then we merge them into one
         if (pipeline.getNumStreams() > 1)
         {
-
             auto transform = std::make_shared<MergingSortedTransform>(
                     pipeline.getHeader(),
                     pipeline.getNumStreams(),
                     result_description,
-                    max_block_size, limit);
+                    max_block_size,
+                    limit);
 
             pipeline.addTransform(std::move(transform));
         }
diff --git a/src/Processors/Sources/BlocksListSource.h b/src/Processors/Sources/BlocksListSource.h
index e0388214f3e..97e568a7dc0 100644
--- a/src/Processors/Sources/BlocksListSource.h
+++ b/src/Processors/Sources/BlocksListSource.h
@@ -7,7 +7,7 @@ namespace DB
 {
 
 /** A stream of blocks from which you can read the next block from an explicitly provided list.
-  * Also see OneBlockInputStream.
+  * Also see SourceFromSingleChunk.
   */
 class BlocksListSource : public SourceWithProgress
 {
diff --git a/src/Processors/Sources/MySQLSource.cpp b/src/Processors/Sources/MySQLSource.cpp
index 1bad1b74446..f536f692a5d 100644
--- a/src/Processors/Sources/MySQLSource.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -56,7 +56,7 @@ MySQLSource::MySQLSource(
     const Block & sample_block,
     const StreamSettings & settings_)
     : SourceWithProgress(sample_block.cloneEmpty())
-    , log(&Poco::Logger::get("MySQLBlockInputStream"))
+    , log(&Poco::Logger::get("MySQLSource"))
     , connection{std::make_unique<Connection>(entry, query_str)}
     , settings{std::make_unique<StreamSettings>(settings_)}
 {
@@ -64,10 +64,10 @@ MySQLSource::MySQLSource(
     initPositionMappingFromQueryResultStructure();
 }
 
-/// For descendant MySQLWithFailoverBlockInputStream
+/// For descendant MySQLWithFailoverSource
 MySQLSource::MySQLSource(const Block &sample_block_, const StreamSettings & settings_)
     : SourceWithProgress(sample_block_.cloneEmpty())
-    , log(&Poco::Logger::get("MySQLBlockInputStream"))
+    , log(&Poco::Logger::get("MySQLSource"))
     , settings(std::make_unique<StreamSettings>(settings_))
 {
     description.init(sample_block_);
diff --git a/src/Processors/Sources/SourceWithProgress.cpp b/src/Processors/Sources/SourceWithProgress.cpp
index 60c39c919f6..b568166a3ab 100644
--- a/src/Processors/Sources/SourceWithProgress.cpp
+++ b/src/Processors/Sources/SourceWithProgress.cpp
@@ -148,8 +148,24 @@ void SourceWithProgress::progress(const Progress & value)
             quota->used({QuotaType::READ_ROWS, value.read_rows}, {QuotaType::READ_BYTES, value.read_bytes});
     }
 
-    ProfileEvents::increment(ProfileEvents::SelectedRows, value.read_rows);
-    ProfileEvents::increment(ProfileEvents::SelectedBytes, value.read_bytes);
+    auto query_kind = IAST::QueryKind::None;
+    if (process_list_elem)
+        query_kind = process_list_elem->getQueryKind();
+
+    if (query_kind == IAST::QueryKind::None || query_kind == IAST::QueryKind::System)
+    {
+        /// Don't increase profile event counters for merges and mutations, cause they use
+        /// a separate counter MergedRows/MergedBytes.
+
+        /// This is a bad way to check that a query is merge or mutation. Will fix it later.
+        /// Note: you can't just check for QueryKind::Select, cause there are
+        /// queries like CREATE AS SELECT or INSERT SELECT.
+    }
+    else
+    {
+        ProfileEvents::increment(ProfileEvents::SelectedRows, value.read_rows);
+        ProfileEvents::increment(ProfileEvents::SelectedBytes, value.read_bytes);
+    }
 }
 
 }
diff --git a/src/Processors/Sources/SourceWithProgress.h b/src/Processors/Sources/SourceWithProgress.h
index 912a548f977..57002006957 100644
--- a/src/Processors/Sources/SourceWithProgress.h
+++ b/src/Processors/Sources/SourceWithProgress.h
@@ -42,6 +42,7 @@ public:
 
     /// Set the approximate total number of rows to read.
     virtual void addTotalRowsApprox(size_t value) = 0;
+    virtual void setTotalRowsApprox(size_t value) = 0;
 };
 
 /// Implementation for ISourceWithProgress
@@ -58,6 +59,7 @@ public:
     void setProcessListElement(QueryStatus * elem) final;
     void setProgressCallback(const ProgressCallback & callback) final { progress_callback = callback; }
     void addTotalRowsApprox(size_t value) final { total_rows_approx += value; }
+    void setTotalRowsApprox(size_t value) final { total_rows_approx = value; }
 
 protected:
     /// Call this method to provide information about progress.
diff --git a/src/Processors/Transforms/FinishSortingTransform.cpp b/src/Processors/Transforms/FinishSortingTransform.cpp
index abded9bd2f0..3842e034de7 100644
--- a/src/Processors/Transforms/FinishSortingTransform.cpp
+++ b/src/Processors/Transforms/FinishSortingTransform.cpp
@@ -25,8 +25,9 @@ FinishSortingTransform::FinishSortingTransform(
     const SortDescription & description_sorted_,
     const SortDescription & description_to_sort_,
     size_t max_merged_block_size_,
-    UInt64 limit_)
-    : SortingTransform(header, description_to_sort_, max_merged_block_size_, limit_)
+    UInt64 limit_,
+    bool increase_sort_description_compile_attempts)
+    : SortingTransform(header, description_to_sort_, max_merged_block_size_, limit_, increase_sort_description_compile_attempts)
 {
     /// Check for sanity non-modified descriptions
     if (!isPrefix(description_sorted_, description_to_sort_))
diff --git a/src/Processors/Transforms/FinishSortingTransform.h b/src/Processors/Transforms/FinishSortingTransform.h
index 3bebcc0a68f..99a293fc1b0 100644
--- a/src/Processors/Transforms/FinishSortingTransform.h
+++ b/src/Processors/Transforms/FinishSortingTransform.h
@@ -16,7 +16,8 @@ public:
         const SortDescription & description_sorted_,
         const SortDescription & description_to_sort_,
         size_t max_merged_block_size_,
-        UInt64 limit_);
+        UInt64 limit_,
+        bool increase_sort_description_compile_attempts);
 
     String getName() const override { return "FinishSortingTransform"; }
 
diff --git a/src/Processors/Transforms/MergeSortingTransform.cpp b/src/Processors/Transforms/MergeSortingTransform.cpp
index 1fe945cbbc9..0c4615e9273 100644
--- a/src/Processors/Transforms/MergeSortingTransform.cpp
+++ b/src/Processors/Transforms/MergeSortingTransform.cpp
@@ -92,12 +92,13 @@ MergeSortingTransform::MergeSortingTransform(
     const SortDescription & description_,
     size_t max_merged_block_size_,
     UInt64 limit_,
+    bool increase_sort_description_compile_attempts,
     size_t max_bytes_before_remerge_,
     double remerge_lowered_memory_bytes_ratio_,
     size_t max_bytes_before_external_sort_,
     VolumePtr tmp_volume_,
     size_t min_free_disk_space_)
-    : SortingTransform(header, description_, max_merged_block_size_, limit_)
+    : SortingTransform(header, description_, max_merged_block_size_, limit_, increase_sort_description_compile_attempts)
     , max_bytes_before_remerge(max_bytes_before_remerge_)
     , remerge_lowered_memory_bytes_ratio(remerge_lowered_memory_bytes_ratio_)
     , max_bytes_before_external_sort(max_bytes_before_external_sort_)
diff --git a/src/Processors/Transforms/MergeSortingTransform.h b/src/Processors/Transforms/MergeSortingTransform.h
index 34a4842949b..e118a2a655b 100644
--- a/src/Processors/Transforms/MergeSortingTransform.h
+++ b/src/Processors/Transforms/MergeSortingTransform.h
@@ -23,6 +23,7 @@ public:
         const SortDescription & description_,
         size_t max_merged_block_size_,
         UInt64 limit_,
+        bool increase_sort_description_compile_attempts,
         size_t max_bytes_before_remerge_,
         double remerge_lowered_memory_bytes_ratio_,
         size_t max_bytes_before_external_sort_,
diff --git a/src/Processors/Transforms/SortingTransform.cpp b/src/Processors/Transforms/SortingTransform.cpp
index c0f700070fa..37a0bf0b7d1 100644
--- a/src/Processors/Transforms/SortingTransform.cpp
+++ b/src/Processors/Transforms/SortingTransform.cpp
@@ -127,11 +127,12 @@ Chunk MergeSorter::mergeImpl(TSortingHeap & queue)
     return Chunk(std::move(merged_columns), merged_rows);
 }
 
-
 SortingTransform::SortingTransform(
     const Block & header,
     const SortDescription & description_,
-    size_t max_merged_block_size_, UInt64 limit_)
+    size_t max_merged_block_size_,
+    UInt64 limit_,
+    bool increase_sort_description_compile_attempts)
     : IProcessor({header}, {header})
     , description(description_)
     , max_merged_block_size(max_merged_block_size_)
@@ -154,6 +155,9 @@ SortingTransform::SortingTransform(
         }
     }
 
+    DataTypes sort_description_types;
+    sort_description_types.reserve(description.size());
+
     /// Remove constants from column_description and remap positions.
     SortDescription description_without_constants;
     description_without_constants.reserve(description.size());
@@ -161,11 +165,17 @@ SortingTransform::SortingTransform(
     {
         auto old_pos = header.getPositionByName(column_description.column_name);
         auto new_pos = map[old_pos];
+
         if (new_pos < num_columns)
+        {
+            sort_description_types.emplace_back(sample.safeGetByPosition(old_pos).type);
             description_without_constants.push_back(column_description);
+        }
     }
 
     description.swap(description_without_constants);
+
+    compileSortDescriptionIfNeeded(description, sort_description_types, increase_sort_description_compile_attempts /*increase_compile_attemps*/);
 }
 
 SortingTransform::~SortingTransform() = default;
diff --git a/src/Processors/Transforms/SortingTransform.h b/src/Processors/Transforms/SortingTransform.h
index 380ef4dff88..938fd68811b 100644
--- a/src/Processors/Transforms/SortingTransform.h
+++ b/src/Processors/Transforms/SortingTransform.h
@@ -68,7 +68,9 @@ public:
     /// limit - if not 0, allowed to return just first 'limit' rows in sorted order.
     SortingTransform(const Block & header,
         const SortDescription & description_,
-        size_t max_merged_block_size_, UInt64 limit_);
+        size_t max_merged_block_size_,
+        UInt64 limit_,
+        bool increase_sort_description_compile_attempts);
 
     ~SortingTransform() override;
 
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
index 88a36a9a235..7d567143a58 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.cpp
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -188,8 +188,8 @@ Chain buildPushingToViewsChain(
     auto storage_header = no_destination ? metadata_snapshot->getSampleBlockWithVirtuals(storage->getVirtuals())
                                          : metadata_snapshot->getSampleBlock();
 
-    /** TODO This is a very important line. At any insertion into the table one of streams should own lock.
-      * Although now any insertion into the table is done via PushingToViewsBlockOutputStream,
+    /** TODO This is a very important line. At any insertion into the table one of chains should own lock.
+      * Although now any insertion into the table is done via PushingToViews chain,
       *  but it's clear that here is not the best place for this functionality.
       */
     result_chain.addTableLock(storage->lockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout));
diff --git a/src/QueryPipeline/Pipe.cpp b/src/QueryPipeline/Pipe.cpp
index 67faaefbf66..19009d9692a 100644
--- a/src/QueryPipeline/Pipe.cpp
+++ b/src/QueryPipeline/Pipe.cpp
@@ -509,7 +509,7 @@ void Pipe::addTransform(ProcessorPtr transform, OutputPort * totals, OutputPort
     for (size_t i = 1; i < output_ports.size(); ++i)
         assertBlocksHaveEqualStructure(header, output_ports[i]->getHeader(), "Pipes");
 
-    // Temporarily skip this check. TotaslHavingTransform may return finalized totals but not finalized data.
+    // Temporarily skip this check. TotalsHavingTransform may return finalized totals but not finalized data.
     // if (totals_port)
     //     assertBlocksHaveEqualStructure(header, totals_port->getHeader(), "Pipes");
 
diff --git a/src/QueryPipeline/RemoteInserter.cpp b/src/QueryPipeline/RemoteInserter.cpp
index aec7562e133..d5cef72b020 100644
--- a/src/QueryPipeline/RemoteInserter.cpp
+++ b/src/QueryPipeline/RemoteInserter.cpp
@@ -50,7 +50,7 @@ RemoteInserter::RemoteInserter(
     /** Send query and receive "header", that describes table structure.
       * Header is needed to know, what structure is required for blocks to be passed to 'write' method.
       */
-    connection.sendQuery(timeouts, query, "", QueryProcessingStage::Complete, &settings_, &modified_client_info, false);
+    connection.sendQuery(timeouts, query, "", QueryProcessingStage::Complete, &settings_, &modified_client_info, false, {});
 
     while (true)
     {
diff --git a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
index e19d2c7114b..feae7127349 100644
--- a/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
+++ b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
@@ -83,7 +83,7 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-            DEFAULT_MERGE_BLOCK_SIZE, 0, nullptr, false, true);
+        DEFAULT_MERGE_BLOCK_SIZE, false, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
@@ -130,7 +130,7 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-            DEFAULT_MERGE_BLOCK_SIZE, 0, nullptr, false, true);
+            DEFAULT_MERGE_BLOCK_SIZE, false, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
diff --git a/src/QueryPipeline/tests/gtest_check_sorted_stream.cpp b/src/QueryPipeline/tests/gtest_check_sorted_stream.cpp
index 8c43cc90efc..c8ab2e3a973 100644
--- a/src/QueryPipeline/tests/gtest_check_sorted_stream.cpp
+++ b/src/QueryPipeline/tests/gtest_check_sorted_stream.cpp
@@ -83,7 +83,7 @@ static Block getEqualValuesBlockWithSize(
 }
 
 
-TEST(CheckSortedBlockInputStream, CheckGoodCase)
+TEST(CheckSortedTransform, CheckGoodCase)
 {
     std::vector<std::string> key_columns{"K1", "K2", "K3"};
     auto sort_description = getSortDescription(key_columns);
@@ -109,7 +109,7 @@ TEST(CheckSortedBlockInputStream, CheckGoodCase)
     EXPECT_FALSE(executor.pull(chunk));
 }
 
-TEST(CheckSortedBlockInputStream, CheckBadLastRow)
+TEST(CheckSortedTransform, CheckBadLastRow)
 {
     std::vector<std::string> key_columns{"K1", "K2", "K3"};
     auto sort_description = getSortDescription(key_columns);
@@ -139,7 +139,7 @@ TEST(CheckSortedBlockInputStream, CheckBadLastRow)
 }
 
 
-TEST(CheckSortedBlockInputStream, CheckUnsortedBlock1)
+TEST(CheckSortedTransform, CheckUnsortedBlock1)
 {
     std::vector<std::string> key_columns{"K1", "K2", "K3"};
     auto sort_description = getSortDescription(key_columns);
@@ -163,7 +163,7 @@ TEST(CheckSortedBlockInputStream, CheckUnsortedBlock1)
 #endif
 }
 
-TEST(CheckSortedBlockInputStream, CheckUnsortedBlock2)
+TEST(CheckSortedTransform, CheckUnsortedBlock2)
 {
     std::vector<std::string> key_columns{"K1", "K2", "K3"};
     auto sort_description = getSortDescription(key_columns);
@@ -186,7 +186,7 @@ TEST(CheckSortedBlockInputStream, CheckUnsortedBlock2)
 #endif
 }
 
-TEST(CheckSortedBlockInputStream, CheckUnsortedBlock3)
+TEST(CheckSortedTransform, CheckUnsortedBlock3)
 {
     std::vector<std::string> key_columns{"K1", "K2", "K3"};
     auto sort_description = getSortDescription(key_columns);
@@ -209,7 +209,7 @@ TEST(CheckSortedBlockInputStream, CheckUnsortedBlock3)
 #endif
 }
 
-TEST(CheckSortedBlockInputStream, CheckEqualBlock)
+TEST(CheckSortedTransform, CheckEqualBlock)
 {
     std::vector<std::string> key_columns{"K1", "K2", "K3"};
     auto sort_description = getSortDescription(key_columns);
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 99ee1b7f7f3..414c596eb05 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -627,7 +627,7 @@ namespace
         void executeQuery();
 
         void processInput();
-        void initializeBlockInputStream(const Block & header);
+        void initializePipeline(const Block & header);
         void createExternalTables();
 
         void generateOutput();
@@ -920,7 +920,7 @@ namespace
             if (context != query_context)
                 throw Exception("Unexpected context in Input initializer", ErrorCodes::LOGICAL_ERROR);
             input_function_is_used = true;
-            initializeBlockInputStream(input_storage->getInMemoryMetadataPtr()->getSampleBlock());
+            initializePipeline(input_storage->getInMemoryMetadataPtr()->getSampleBlock());
         });
 
         query_context->setInputBlocksReaderCallback([this](ContextPtr context) -> Block
@@ -967,7 +967,7 @@ namespace
 
         /// This is significant, because parallel parsing may be used.
         /// So we mustn't touch the input stream from other thread.
-        initializeBlockInputStream(io.pipeline.getHeader());
+        initializePipeline(io.pipeline.getHeader());
 
         PushingPipelineExecutor executor(io.pipeline);
         executor.start();
@@ -982,7 +982,7 @@ namespace
         executor.finish();
     }
 
-    void Call::initializeBlockInputStream(const Block & header)
+    void Call::initializePipeline(const Block & header)
     {
         assert(!read_buffer);
         read_buffer = std::make_unique<ReadBufferFromCallback>([this]() -> std::pair<const void *, size_t>
@@ -1482,7 +1482,7 @@ namespace
 
     void Call::addProgressToResult()
     {
-        auto values = progress.fetchAndResetPiecewiseAtomically();
+        auto values = progress.fetchValuesAndResetPiecewiseAtomically();
         if (!values.read_rows && !values.read_bytes && !values.total_rows_to_read && !values.written_rows && !values.written_bytes)
             return;
         auto & grpc_progress = *result.mutable_progress();
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index a038dcb3e6c..c71b3834726 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -1329,6 +1329,7 @@ void TCPHandler::receiveQuery()
         query_context->getIgnoredPartUUIDs()->add(*state.part_uuids_to_ignore);
 
     query_context->setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
+    query_context->setFileProgressCallback([this](const FileProgress & value) { this->updateProgress(Progress(value)); });
 
     ///
     /// Settings
@@ -1736,7 +1737,7 @@ void TCPHandler::updateProgress(const Progress & value)
 void TCPHandler::sendProgress()
 {
     writeVarUInt(Protocol::Server::Progress, *out);
-    auto increment = state.progress.fetchAndResetPiecewiseAtomically();
+    auto increment = state.progress.fetchValuesAndResetPiecewiseAtomically();
     increment.write(*out, client_tcp_protocol_version);
     out->next();
 }
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 740d12e7f8c..5cafe4d829d 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -299,7 +299,7 @@ namespace
         }
 
         /// This is old format, that does not have header for the block in the file header,
-        /// applying ConvertingBlockInputStream in this case is not a big overhead.
+        /// applying ConvertingTransform in this case is not a big overhead.
         ///
         /// Anyway we can get header only from the first block, which contain all rows anyway.
         if (!distributed_header.block_header)
diff --git a/src/Storages/Distributed/DirectoryMonitor.h b/src/Storages/Distributed/DirectoryMonitor.h
index 3c0f3b29dde..7015fca0311 100644
--- a/src/Storages/Distributed/DirectoryMonitor.h
+++ b/src/Storages/Distributed/DirectoryMonitor.h
@@ -52,7 +52,7 @@ public:
 
     static std::shared_ptr<ISource> createSourceFromFile(const String & file_name);
 
-    /// For scheduling via DistributedBlockOutputStream.
+    /// For scheduling via DistributedSink.
     bool addAndSchedule(size_t file_size, size_t ms);
 
     struct InternalStatus
@@ -122,8 +122,6 @@ private:
 
     CurrentMetrics::Increment metric_pending_files;
     CurrentMetrics::Increment metric_broken_files;
-
-    friend class DirectoryMonitorBlockInputStream;
 };
 
 }
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index 27fb0469854..798de060768 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -123,7 +123,7 @@ DistributedSink::DistributedSink(
     , insert_timeout(insert_timeout_)
     , main_table(main_table_)
     , columns_to_send(columns_to_send_.begin(), columns_to_send_.end())
-    , log(&Poco::Logger::get("DistributedBlockOutputStream"))
+    , log(&Poco::Logger::get("DistributedSink"))
 {
     const auto & settings = context->getSettingsRef();
     if (settings.max_distributed_depth && context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
@@ -610,7 +610,7 @@ void DistributedSink::writeSplitAsync(const Block & block)
 
 void DistributedSink::writeAsyncImpl(const Block & block, size_t shard_id)
 {
-    OpenTelemetrySpanHolder span("DistributedBlockOutputStream::writeAsyncImpl()");
+    OpenTelemetrySpanHolder span("DistributedSink::writeAsyncImpl()");
 
     const auto & shard_info = cluster->getShardsInfo()[shard_id];
     const auto & settings = context->getSettingsRef();
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index 441504a3e7e..0176487bbfe 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -415,6 +415,11 @@ public:
         writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
+    void onException() override
+    {
+        write_buf->finalize();
+    }
+
     void onFinish() override
     {
         try
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.cpp b/src/Storages/Kafka/KafkaBlockSink.cpp
similarity index 95%
rename from src/Storages/Kafka/KafkaBlockOutputStream.cpp
rename to src/Storages/Kafka/KafkaBlockSink.cpp
index aeaee04c506..2c7cfffb9a1 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockSink.cpp
@@ -1,4 +1,4 @@
-#include <Storages/Kafka/KafkaBlockOutputStream.h>
+#include <Storages/Kafka/KafkaSink.h>
 
 #include <Formats/FormatFactory.h>
 #include <Processors/Formats/IOutputFormat.h>
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.h b/src/Storages/Kafka/KafkaSink.h
similarity index 100%
rename from src/Storages/Kafka/KafkaBlockOutputStream.h
rename to src/Storages/Kafka/KafkaSink.h
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index c985cf49ae6..394ea73d648 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -18,7 +18,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
-#include <Storages/Kafka/KafkaBlockOutputStream.h>
+#include <Storages/Kafka/KafkaSink.h>
 #include <Storages/Kafka/KafkaSettings.h>
 #include <Storages/Kafka/KafkaSource.h>
 #include <Storages/Kafka/WriteBufferToKafkaProducer.h>
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index edd062aa592..adda446c5a2 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -382,7 +382,7 @@ bool StorageLiveView::getNewBlocks()
 
     /// can't set mergeable_blocks here or anywhere else outside the writeIntoLiveView function
     /// as there could be a race codition when the new block has been inserted into
-    /// the source table by the PushingToViewsBlockOutputStream and this method
+    /// the source table by the PushingToViews chain and this method
     /// called before writeIntoLiveView function is called which can lead to
     /// the same block added twice to the mergeable_blocks leading to
     /// inserted data to be duplicated
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index cb01fe3fcfc..58bffaab34b 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -778,6 +778,9 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
 
     Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();
     SortDescription sort_description;
+    sort_description.compile_sort_description = global_ctx->data->getContext()->getSettingsRef().compile_sort_description;
+    sort_description.min_count_to_compile_sort_description = global_ctx->data->getContext()->getSettingsRef().min_count_to_compile_sort_description;
+
     size_t sort_columns_size = sort_columns.size();
     sort_description.reserve(sort_columns_size);
 
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
index a28b186a444..1c347970558 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
@@ -30,7 +30,7 @@ NameSet injectRequiredColumns(
     Names & columns);
 
 
-/// A batch of work for MergeTreeThreadSelectBlockInputStream
+/// A batch of work for MergeTreeThreadSelectProcessor
 struct MergeTreeReadTask
 {
     /// data part which should be read while performing this task
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 48728bbfdc9..dd900ecbcf5 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1754,14 +1754,48 @@ size_t MergeTreeData::clearOldPartsFromFilesystem(bool force)
     return parts_to_remove.size();
 }
 
-void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_remove)
+
+void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts, bool throw_on_error, NameSet * parts_failed_to_delete)
+{
+    NameSet part_names_successeded;
+
+    auto get_failed_parts = [&part_names_successeded, &parts_failed_to_delete, &parts] ()
+    {
+        if (part_names_successeded.size() == parts.size())
+            return;
+
+        if (parts_failed_to_delete)
+        {
+            for (const auto & part : parts)
+            {
+                if (!part_names_successeded.contains(part->name))
+                    parts_failed_to_delete->insert(part->name);
+            }
+        }
+    };
+
+    try
+    {
+        clearPartsFromFilesystemImpl(parts, &part_names_successeded);
+        get_failed_parts();
+    }
+    catch (...)
+    {
+        get_failed_parts();
+
+        if (throw_on_error)
+            throw;
+    }
+}
+
+void MergeTreeData::clearPartsFromFilesystemImpl(const DataPartsVector & parts_to_remove, NameSet * part_names_successed)
 {
     const auto settings = getSettings();
     if (parts_to_remove.size() > 1 && settings->max_part_removal_threads > 1 && parts_to_remove.size() > settings->concurrent_part_removal_threshold)
     {
         /// Parallel parts removal.
-
         size_t num_threads = std::min<size_t>(settings->max_part_removal_threads, parts_to_remove.size());
+        std::mutex part_names_mutex;
         ThreadPool pool(num_threads);
 
         /// NOTE: Under heavy system load you may get "Cannot schedule a task" from ThreadPool.
@@ -1774,6 +1808,11 @@ void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_re
 
                 LOG_DEBUG(log, "Removing part from filesystem {}", part->name);
                 part->remove();
+                if (part_names_successed)
+                {
+                    std::lock_guard lock(part_names_mutex);
+                    part_names_successed->insert(part->name);
+                }
             });
         }
 
@@ -1785,6 +1824,8 @@ void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_re
         {
             LOG_DEBUG(log, "Removing part from filesystem {}", part->name);
             part->remove();
+            if (part_names_successed)
+                part_names_successed->insert(part->name);
         }
     }
 }
@@ -2989,7 +3030,7 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSetAn
     /// We a going to remove active parts covered by drop_range without timeout.
     /// Let's also reset timeout for inactive parts
     /// and add these parts to list of parts to remove from ZooKeeper
-    auto inactive_parts_to_remove_immediately = getDataPartsVectorInPartitionForInternalUsage(DataPartState::Outdated, drop_range.partition_id, &lock);
+    auto inactive_parts_to_remove_immediately = getDataPartsVectorInPartitionForInternalUsage({DataPartState::Outdated, DataPartState::Deleting}, drop_range.partition_id, &lock);
 
     /// FIXME refactor removePartsFromWorkingSet(...), do not remove parts twice
     removePartsFromWorkingSet(txn, parts_to_remove, clear_without_timeout, lock);
@@ -3461,6 +3502,19 @@ MergeTreeData::DataPartsVector MergeTreeData::getVisibleDataPartsVectorInPartiti
     return getDataPartsVectorInPartitionForInternalUsage(MergeTreeDataPartState::Active, partition_id, acquired_lock);
 }
 
+
+MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVectorInPartitionForInternalUsage(const DataPartStates & affordable_states, const String & partition_id, DataPartsLock * acquired_lock) const
+{
+    auto lock = (acquired_lock) ? DataPartsLock() : lockParts();
+    DataPartsVector res;
+    for (const auto & state : affordable_states)
+    {
+        DataPartStateAndPartitionID state_with_partition{state, partition_id};
+        res.insert(res.end(), data_parts_by_state_and_info.lower_bound(state_with_partition), data_parts_by_state_and_info.upper_bound(state_with_partition));
+    }
+    return res;
+}
+
 MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVectorInPartitionForInternalUsage(
     const MergeTreeData::DataPartState & state, const String & partition_id, DataPartsLock * acquired_lock) const
 {
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 783370933d6..df37cd000e4 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -110,7 +110,7 @@ namespace ErrorCodes
 /// Several modes are implemented. Modes determine additional actions during merge:
 /// - Ordinary - don't do anything special
 /// - Collapsing - collapse pairs of rows with the opposite values of sign_columns for the same values
-///   of primary key (cf. CollapsingSortedBlockInputStream.h)
+///   of primary key (cf. CollapsingSortedTransform.h)
 /// - Replacing - for all rows with the same primary key keep only the latest one. Or, if the version
 ///   column is set, keep the latest row with the maximal version.
 /// - Summing - sum all numeric columns not contained in the primary key for all rows with the same primary key.
@@ -497,6 +497,7 @@ public:
     DataPartsVector getVisibleDataPartsVectorInPartitions(ContextPtr local_context, const std::unordered_set<String> & partition_ids) const;
 
     DataPartsVector getDataPartsVectorInPartitionForInternalUsage(const DataPartState & state, const String & partition_id, DataPartsLock * acquired_lock = nullptr) const;
+    DataPartsVector getDataPartsVectorInPartitionForInternalUsage(const DataPartStates & affordable_states, const String & partition_id, DataPartsLock * acquired_lock = nullptr) const;
 
     /// Returns the part with the given name and state or nullptr if no such part.
     DataPartPtr getPartIfExists(const String & part_name, const DataPartStates & valid_states);
@@ -615,7 +616,8 @@ public:
     /// Delete irrelevant parts from memory and disk.
     /// If 'force' - don't wait for old_parts_lifetime.
     size_t clearOldPartsFromFilesystem(bool force = false);
-    void clearPartsFromFilesystem(const DataPartsVector & parts);
+    /// Try to clear parts from filesystem. Throw exception in case of errors.
+    void clearPartsFromFilesystem(const DataPartsVector & parts, bool throw_on_error = true, NameSet * parts_failed_to_delete = nullptr);
 
     /// Delete WAL files containing parts, that all already stored on disk.
     size_t clearOldWriteAheadLogs();
@@ -1298,6 +1300,11 @@ private:
     /// distributed operations which can lead to data duplication. Implemented only in ReplicatedMergeTree.
     virtual std::optional<ZeroCopyLock> tryCreateZeroCopyExclusiveLock(const String &, const DiskPtr &) { return std::nullopt; }
 
+    /// Remove parts from disk calling part->remove(). Can do it in parallel in case of big set of parts and enabled settings.
+    /// If we fail to remove some part and throw_on_error equal to `true` will throw an exception on the first failed part.
+    /// Otherwise, in non-parallel case will break and return.
+    void clearPartsFromFilesystemImpl(const DataPartsVector & parts, NameSet * part_names_successed);
+
     TemporaryParts temporary_parts;
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index f94bd2cc73b..99e5ef3ee21 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -603,12 +603,12 @@ MergeTreeData::DataPartPtr MergeTreeDataMergerMutator::renameMergedTemporaryPart
          *   then we get here.
          *
          * When M > N parts could be replaced?
-         * - new block was added in ReplicatedMergeTreeBlockOutputStream;
+         * - new block was added in ReplicatedMergeTreeSink;
          * - it was added to working dataset in memory and renamed on filesystem;
          * - but ZooKeeper transaction that adds it to reference dataset in ZK failed;
          * - and it is failed due to connection loss, so we don't rollback working dataset in memory,
          *   because we don't know if the part was added to ZK or not
-         *   (see ReplicatedMergeTreeBlockOutputStream)
+         *   (see ReplicatedMergeTreeSink)
          * - then method selectPartsToMerge selects a range and sees, that EphemeralLock for the block in this part is unlocked,
          *   and so it is possible to merge a range skipping this part.
          *   (NOTE: Merging with part that is not in ZK is not possible, see checks in 'createLogEntryToMergeParts'.)
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 2776ef39b27..bf247074f57 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -228,7 +228,7 @@ Block MergeTreeDataWriter::mergeBlock(
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedAlgorithm>(
                     block, 1, sort_description, merging_params.sign_column,
-                    false, block_size + 1, &Poco::Logger::get("MergeTreeBlockOutputStream"));
+                    false, block_size + 1, &Poco::Logger::get("MergeTreeDataWriter"));
             case MergeTreeData::MergingParams::Summing:
                 return std::make_shared<SummingSortedAlgorithm>(
                     block, 1, sort_description, merging_params.columns_to_sum,
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index 541e6257565..30fb7e55a10 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -199,7 +199,7 @@ bool MergeTreeIndexAggregatorSet::buildFilter(
     size_t limit,
     ClearableSetVariants & variants) const
 {
-    /// Like DistinctSortedBlockInputStream.
+    /// Like DistinctSortedTransform.
     typename Method::State state(column_ptrs, key_sizes, nullptr);
 
     bool has_new_data = false;
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index 0c93c701448..b9db1254e08 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -13,7 +13,7 @@ namespace DB
 
 using MergeTreeReadTaskPtr = std::unique_ptr<MergeTreeReadTask>;
 
-/**   Provides read tasks for MergeTreeThreadSelectBlockInputStream`s in fine-grained batches, allowing for more
+/**   Provides read tasks for MergeTreeThreadSelectProcessor`s in fine-grained batches, allowing for more
  *    uniform distribution of work amongst multiple threads. All parts and their ranges are divided into `threads`
  *    workloads with at most `sum_marks / threads` marks. Then, threads are performing reads from these workloads
  *    in "sequential" manner, requesting work in small batches. As soon as some thread has exhausted
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index c8cac16457c..de55426c37b 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -55,7 +55,7 @@ void MergeTreeWriteAheadLog::init()
 {
     out = disk->writeFile(path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
 
-    /// Small hack: in NativeBlockOutputStream header is used only in `getHeader` method.
+    /// Small hack: in NativeWriter header is used only in `getHeader` method.
     /// To avoid complex logic of changing it during ALTERs we leave it empty.
     block_out = std::make_unique<NativeWriter>(*out, 0, Block{});
     min_block_number = std::numeric_limits<Int64>::max();
diff --git a/src/Storages/PartitionedSink.cpp b/src/Storages/PartitionedSink.cpp
index a42ea4ceff6..fca69916f7f 100644
--- a/src/Storages/PartitionedSink.cpp
+++ b/src/Storages/PartitionedSink.cpp
@@ -111,6 +111,13 @@ void PartitionedSink::consume(Chunk chunk)
     }
 }
 
+void PartitionedSink::onException()
+{
+    for (auto & [_, sink] : partition_id_to_sink)
+    {
+        sink->onException();
+    }
+}
 
 void PartitionedSink::onFinish()
 {
diff --git a/src/Storages/PartitionedSink.h b/src/Storages/PartitionedSink.h
index 7ed29f1b197..652d8a4c046 100644
--- a/src/Storages/PartitionedSink.h
+++ b/src/Storages/PartitionedSink.h
@@ -22,6 +22,8 @@ public:
 
     void consume(Chunk chunk) override;
 
+    void onException() override;
+
     void onFinish() override;
 
     virtual SinkPtr createSinkForPartition(const String & partition_id) = 0;
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index e31dd1a4788..2c3a1489943 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -758,7 +758,7 @@ SinkToStoragePtr StorageDistributed::write(const ASTPtr &, const StorageMetadata
     else
         columns_to_send = metadata_snapshot->getSampleBlockNonMaterialized().getNames();
 
-    /// DistributedBlockOutputStream will not own cluster, but will own ConnectionPools of the cluster
+    /// DistributedSink will not own cluster, but will own ConnectionPools of the cluster
     return std::make_shared<DistributedSink>(
         local_context, *this, metadata_snapshot, cluster, insert_sync, timeout,
         StorageID{remote_database, remote_table}, columns_to_send);
@@ -1050,14 +1050,14 @@ void StorageDistributed::createDirectoryMonitors(const DiskPtr & disk)
         {
             const auto & tmp_path = dir_path / "tmp";
 
-            /// "tmp" created by DistributedBlockOutputStream
+            /// "tmp" created by DistributedSink
             if (std::filesystem::is_directory(tmp_path) && std::filesystem::is_empty(tmp_path))
                 std::filesystem::remove(tmp_path);
 
             if (std::filesystem::is_empty(dir_path))
             {
                 LOG_DEBUG(log, "Removing {} (used for async INSERT into Distributed)", dir_path.string());
-                /// Will be created by DistributedBlockOutputStream on demand.
+                /// Will be created by DistributedSink on demand.
                 std::filesystem::remove(dir_path);
             }
             else
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index c460b8a4c67..5b191b37f5e 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -433,6 +433,8 @@ public:
 
         bool need_path_column = false;
         bool need_file_column = false;
+
+        size_t total_bytes_to_read = 0;
     };
 
     using FilesInfoPtr = std::shared_ptr<FilesInfo>;
@@ -441,7 +443,7 @@ public:
     {
         auto header = metadata_snapshot->getSampleBlock();
 
-        /// Note: AddingDefaultsBlockInputStream doesn't change header.
+        /// Note: AddingDefaultsTransform doesn't change header.
 
         if (need_path_column)
             header.insert(
@@ -573,6 +575,25 @@ public:
                     chunk.addColumn(column->convertToFullColumnIfConst());
                 }
 
+                if (num_rows)
+                {
+                    auto bytes_per_row = std::ceil(static_cast<double>(chunk.bytes()) / num_rows);
+                    size_t total_rows_approx = std::ceil(static_cast<double>(files_info->total_bytes_to_read) / bytes_per_row);
+                    total_rows_approx_accumulated += total_rows_approx;
+                    ++total_rows_count_times;
+                    total_rows_approx = total_rows_approx_accumulated / total_rows_count_times;
+
+                    /// We need to add diff, because total_rows_approx is incremental value.
+                    /// It would be more correct to send total_rows_approx as is (not a diff),
+                    /// but incrementation of total_rows_to_read does not allow that.
+                    /// A new field can be introduces for that to be sent to client, but it does not worth it.
+                    if (total_rows_approx > total_rows_approx_prev)
+                    {
+                        size_t diff = total_rows_approx - total_rows_approx_prev;
+                        addTotalRowsApprox(diff);
+                        total_rows_approx_prev = total_rows_approx;
+                    }
+                }
                 return chunk;
             }
 
@@ -608,6 +629,10 @@ private:
     bool finished_generate = false;
 
     std::shared_lock<std::shared_timed_mutex> shared_lock;
+
+    UInt64 total_rows_approx_accumulated = 0;
+    size_t total_rows_count_times = 0;
+    UInt64 total_rows_approx_prev = 0;
 };
 
 
@@ -620,8 +645,10 @@ Pipe StorageFile::read(
     size_t max_block_size,
     unsigned num_streams)
 {
-    if (use_table_fd)   /// need to call ctr BlockInputStream
+    if (use_table_fd)
+    {
         paths = {""};   /// when use fd, paths are empty
+    }
     else
     {
         if (paths.size() == 1 && !fs::exists(paths[0]))
@@ -635,6 +662,7 @@ Pipe StorageFile::read(
 
     auto files_info = std::make_shared<StorageFileSource::FilesInfo>();
     files_info->files = paths;
+    files_info->total_bytes_to_read = total_bytes_to_read;
 
     for (const auto & column : column_names)
     {
@@ -654,9 +682,8 @@ Pipe StorageFile::read(
 
     /// Set total number of bytes to process. For progress bar.
     auto progress_callback = context->getFileProgressCallback();
-    if ((context->getApplicationType() == Context::ApplicationType::LOCAL
-         || context->getApplicationType() == Context::ApplicationType::CLIENT)
-         && progress_callback)
+
+    if (progress_callback)
         progress_callback(FileProgress(0, total_bytes_to_read));
 
     for (size_t i = 0; i < num_streams; ++i)
@@ -782,11 +809,25 @@ public:
         writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
+    void onException() override
+    {
+        write_buf->finalize();
+    }
+
     void onFinish() override
     {
-        writer->finalize();
-        writer->flush();
-        write_buf->finalize();
+        try
+        {
+            writer->finalize();
+            writer->flush();
+            write_buf->finalize();
+        }
+        catch (...)
+        {
+            /// Stop ParallelFormattingOutputFormat correctly.
+            writer.reset();
+            throw;
+        }
     }
 
 private:
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 4781d3fe3ed..020887dff35 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -119,7 +119,7 @@ void StorageJoin::mutate(const MutationCommands & commands, ContextPtr context)
 
     auto new_data = std::make_shared<HashJoin>(table_join, getRightSampleBlock(), overwrite);
 
-    // New scope controls lifetime of InputStream.
+    // New scope controls lifetime of pipeline.
     {
         auto storage_ptr = DatabaseCatalog::instance().getTable(getStorageID(), context);
         auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, context, true);
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 93da9a25d01..95761ebacea 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -774,7 +774,7 @@ void StorageMerge::convertingSourceStream(
             ColumnWithTypeAndName header_column = header.getByPosition(column_index);
             ColumnWithTypeAndName before_column = before_block_header.getByName(header_column.name);
             /// If the processed_stage greater than FetchColumns and the block structure between streams is different.
-            /// the where expression maybe invalid because of convertingBlockInputStream.
+            /// the where expression maybe invalid because of ConvertingTransform.
             /// So we need to throw exception.
             if (!header_column.type->equals(*before_column.type.get()))
             {
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index 2bacc6030d2..92ae24d929b 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -45,8 +45,6 @@ public:
     static StoragePostgreSQLConfiguration getConfiguration(ASTs engine_args, ContextPtr context);
 
 private:
-    friend class PostgreSQLBlockOutputStream;
-
     String remote_table_name;
     String remote_table_schema;
     String on_conflict;
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 5702d279804..36080485aca 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -4482,7 +4482,7 @@ SinkToStoragePtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, con
     const Settings & query_settings = local_context->getSettingsRef();
     bool deduplicate = storage_settings_ptr->replicated_deduplication_window != 0 && query_settings.insert_deduplicate;
 
-    // TODO: should we also somehow pass list of columns to deduplicate on to the ReplicatedMergeTreeBlockOutputStream ?
+    // TODO: should we also somehow pass list of columns to deduplicate on to the ReplicatedMergeTreeSink?
     return std::make_shared<ReplicatedMergeTreeSink>(
         *this, metadata_snapshot, query_settings.insert_quorum,
         query_settings.insert_quorum_timeout.totalMilliseconds(),
@@ -5077,6 +5077,21 @@ void StorageReplicatedMergeTree::dropPart(const String & part_name, bool detach,
     waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
 }
 
+void StorageReplicatedMergeTree::dropAllPartitionsImpl(const zkutil::ZooKeeperPtr & zookeeper, bool detach, ContextPtr query_context)
+{
+    Strings partitions = zookeeper->getChildren(fs::path(zookeeper_path) / "block_numbers");
+
+    std::vector<LogEntryPtr> entries;
+    dropAllPartsInPartitions(*zookeeper, partitions, entries, query_context, detach);
+
+    for (const auto & entry : entries)
+    {
+        waitForLogEntryToBeProcessedIfNecessary(*entry, query_context);
+        auto drop_range_info = MergeTreePartInfo::fromPartName(entry->new_part_name, format_version);
+        cleanLastPartNode(drop_range_info.partition_id);
+    }
+}
+
 void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool detach, ContextPtr query_context)
 {
     assertNotReadonly();
@@ -5088,31 +5103,15 @@ void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool de
     const auto * partition_ast = partition->as<ASTPartition>();
     if (partition_ast && partition_ast->all)
     {
-        Strings partitions = zookeeper->getChildren(fs::path(zookeeper_path) / "block_numbers");
-
-        std::vector<std::pair<String, std::unique_ptr<LogEntry>>> entries_with_partitionid_to_drop;
-        entries_with_partitionid_to_drop.reserve(partitions.size());
-        for (String & partition_id : partitions)
-        {
-            auto entry = std::make_unique<LogEntry>();
-            if (dropAllPartsInPartition(*zookeeper, partition_id, *entry, query_context, detach))
-                entries_with_partitionid_to_drop.emplace_back(partition_id, std::move(entry));
-        }
-
-        for (const auto & entry : entries_with_partitionid_to_drop)
-        {
-            waitForLogEntryToBeProcessedIfNecessary(*entry.second, query_context);
-            cleanLastPartNode(entry.first);
-        }
+        dropAllPartitionsImpl(zookeeper, detach, query_context);
     }
     else
     {
-        LogEntry entry;
         String partition_id = getPartitionIDFromQuery(partition, query_context);
-        bool did_drop = dropAllPartsInPartition(*zookeeper, partition_id, entry, query_context, detach);
-        if (did_drop)
+        auto entry = dropAllPartsInPartition(*zookeeper, partition_id, query_context, detach);
+        if (entry)
         {
-            waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
+            waitForLogEntryToBeProcessedIfNecessary(*entry, query_context);
             cleanLastPartNode(partition_id);
         }
     }
@@ -5129,20 +5128,7 @@ void StorageReplicatedMergeTree::truncate(
         throw Exception("TRUNCATE cannot be done on this replica because it is not a leader", ErrorCodes::NOT_A_LEADER);
 
     zkutil::ZooKeeperPtr zookeeper = getZooKeeperAndAssertNotReadonly();
-
-    Strings partitions = zookeeper->getChildren(fs::path(zookeeper_path) / "block_numbers");
-
-    std::vector<std::unique_ptr<LogEntry>> entries_to_wait;
-    entries_to_wait.reserve(partitions.size());
-    for (String & partition_id : partitions)
-    {
-        auto entry = std::make_unique<LogEntry>();
-        if (dropAllPartsInPartition(*zookeeper, partition_id, *entry, query_context, false))
-            entries_to_wait.push_back(std::move(entry));
-    }
-
-    for (const auto & entry : entries_to_wait)
-        waitForLogEntryToBeProcessedIfNecessary(*entry, query_context);
+    dropAllPartitionsImpl(zookeeper, /* detach */ false, query_context);
 }
 
 
@@ -6112,6 +6098,8 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
             RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
     auto zookeeper = getZooKeeper();
 
+    /// Now these parts are in Deleting state. If we fail to remove some of them we must roll them back to Outdated state.
+    /// Otherwise they will not be deleted.
     DataPartsVector parts = grabOldParts();
     if (parts.empty())
         return;
@@ -6130,13 +6118,49 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
     }
     parts.clear();
 
+    auto delete_parts_from_fs_and_rollback_in_case_of_error = [this] (const DataPartsVector & parts_to_delete, const String & parts_type)
+    {
+        NameSet parts_failed_to_delete;
+        clearPartsFromFilesystem(parts_to_delete, false, &parts_failed_to_delete);
+
+        DataPartsVector finally_remove_parts;
+        if (!parts_failed_to_delete.empty())
+        {
+            DataPartsVector rollback_parts;
+            for (const auto & part : parts_to_delete)
+            {
+                if (!parts_failed_to_delete.contains(part->name))
+                    finally_remove_parts.push_back(part);
+                else
+                    rollback_parts.push_back(part);
+            }
+
+            if (!rollback_parts.empty())
+                rollbackDeletingParts(rollback_parts);
+        }
+        else  /// all parts was successfully removed
+        {
+            finally_remove_parts = parts_to_delete;
+        }
+
+        try
+        {
+            removePartsFinally(finally_remove_parts);
+            LOG_DEBUG(log, "Removed {} {} parts", finally_remove_parts.size(), parts_type);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Failed to remove some parts from memory, or write info about them into part log");
+        }
+    };
+
     /// Delete duplicate parts from filesystem
     if (!parts_to_delete_only_from_filesystem.empty())
     {
-        clearPartsFromFilesystem(parts_to_delete_only_from_filesystem);
-        removePartsFinally(parts_to_delete_only_from_filesystem);
-
-        LOG_DEBUG(log, "Removed {} old duplicate parts", parts_to_delete_only_from_filesystem.size());
+        /// It can happen that some error appear during part removal from FS.
+        /// In case of such exception we have to change state of failed parts from Deleting to Outdated.
+        /// Otherwise nobody will try to remove them again (see grabOldParts).
+        delete_parts_from_fs_and_rollback_in_case_of_error(parts_to_delete_only_from_filesystem, "old duplicate");
     }
 
     /// Delete normal parts from ZooKeeper
@@ -6175,13 +6199,14 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
         LOG_DEBUG(log, "Will retry deletion of {} parts in the next time", parts_to_retry_deletion.size());
     }
 
+
     /// Remove parts from filesystem and finally from data_parts
     if (!parts_to_remove_from_filesystem.empty())
     {
-        clearPartsFromFilesystem(parts_to_remove_from_filesystem);
-        removePartsFinally(parts_to_remove_from_filesystem);
-
-        LOG_DEBUG(log, "Removed {} old parts", parts_to_remove_from_filesystem.size());
+        /// It can happen that some error appear during part removal from FS.
+        /// In case of such exception we have to change state of failed parts from Deleting to Outdated.
+        /// Otherwise nobody will try to remove them again (see grabOldParts).
+        delete_parts_from_fs_and_rollback_in_case_of_error(parts_to_remove_from_filesystem, "old");
     }
 }
 
@@ -7163,44 +7188,67 @@ bool StorageReplicatedMergeTree::dropPartImpl(
     }
 }
 
-bool StorageReplicatedMergeTree::dropAllPartsInPartition(
-    zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, ContextPtr query_context, bool detach)
+bool StorageReplicatedMergeTree::addOpsToDropAllPartsInPartition(
+    zkutil::ZooKeeper & zookeeper, const String & partition_id, bool detach,
+    Coordination::Requests & ops, std::vector<LogEntryPtr> & entries,
+    std::vector<EphemeralLockInZooKeeper> & delimiting_block_locks,
+    std::vector<size_t> & log_entry_ops_idx)
 {
+    MergeTreePartInfo drop_range_info;
+
+    /// It would prevent other replicas from assigning merges which intersect locked block number.
+    std::optional<EphemeralLockInZooKeeper> delimiting_block_lock;
+
+    if (!getFakePartCoveringAllPartsInPartition(partition_id, drop_range_info, delimiting_block_lock))
+    {
+        LOG_INFO(log, "Will not drop partition {}, it is empty.", partition_id);
+        return false;
+    }
+
+    clearBlocksInPartition(zookeeper, partition_id, drop_range_info.min_block, drop_range_info.max_block);
+
+    String drop_range_fake_part_name = getPartNamePossiblyFake(format_version, drop_range_info);
+
+    LOG_DEBUG(log, "Disabled merges covered by range {}", drop_range_fake_part_name);
+
+    /// Finally, having achieved the necessary invariants, you can put an entry in the log.
+    auto entry = std::make_shared<LogEntry>();
+    entry->type = LogEntry::DROP_RANGE;
+    entry->source_replica = replica_name;
+    entry->new_part_name = drop_range_fake_part_name;
+    entry->detach = detach;
+    entry->create_time = time(nullptr);
+
+    log_entry_ops_idx.push_back(ops.size());
+    ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry->toString(),
+                                               zkutil::CreateMode::PersistentSequential));
+    delimiting_block_lock->getUnlockOps(ops);
+    delimiting_block_locks.push_back(std::move(*delimiting_block_lock));
+    entries.push_back(std::move(entry));
+    return true;
+}
+
+void StorageReplicatedMergeTree::dropAllPartsInPartitions(
+    zkutil::ZooKeeper & zookeeper, const Strings partition_ids, std::vector<LogEntryPtr> & entries, ContextPtr query_context, bool detach)
+{
+    entries.reserve(partition_ids.size());
+
     /// Retry if alter_partition_version changes
     for (size_t retry = 0; retry < 1000; ++retry)
     {
+        entries.clear();
         String alter_partition_version_path = zookeeper_path + "/alter_partition_version";
         Coordination::Stat alter_partition_version_stat;
         zookeeper.get(alter_partition_version_path, &alter_partition_version_stat);
 
-        MergeTreePartInfo drop_range_info;
-
-        /// It would prevent other replicas from assigning merges which intersect locked block number.
-        std::optional<EphemeralLockInZooKeeper> delimiting_block_lock;
-
-        if (!getFakePartCoveringAllPartsInPartition(partition_id, drop_range_info, delimiting_block_lock))
-        {
-            LOG_INFO(log, "Will not drop partition {}, it is empty.", partition_id);
-            return false;
-        }
-
-        clearBlocksInPartition(zookeeper, partition_id, drop_range_info.min_block, drop_range_info.max_block);
-
-        String drop_range_fake_part_name = getPartNamePossiblyFake(format_version, drop_range_info);
-
-        LOG_DEBUG(log, "Disabled merges covered by range {}", drop_range_fake_part_name);
-
-        /// Finally, having achieved the necessary invariants, you can put an entry in the log.
-        entry.type = LogEntry::DROP_RANGE;
-        entry.source_replica = replica_name;
-        entry.new_part_name = drop_range_fake_part_name;
-        entry.detach = detach;
-        entry.create_time = time(nullptr);
-
         Coordination::Requests ops;
-
-        ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry.toString(),
-            zkutil::CreateMode::PersistentSequential));
+        std::vector<EphemeralLockInZooKeeper> delimiting_block_locks;
+        std::vector<size_t> log_entry_ops_idx;
+        ops.reserve(partition_ids.size() * 2);
+        delimiting_block_locks.reserve(partition_ids.size());
+        log_entry_ops_idx.reserve(partition_ids.size());
+        for (const auto & partition_id : partition_ids)
+            addOpsToDropAllPartsInPartition(zookeeper, partition_id, detach, ops, entries, delimiting_block_locks, log_entry_ops_idx);
 
         /// Check and update version to avoid race with REPLACE_RANGE.
         /// Otherwise new parts covered by drop_range_info may appear after execution of current DROP_RANGE entry
@@ -7209,7 +7257,6 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
 
         /// Just update version, because merges assignment relies on it
         ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
-        delimiting_block_lock->getUnlockOps(ops);
 
         if (auto txn = query_context->getZooKeeperMetadataTransaction())
             txn->moveOpsTo(ops);
@@ -7218,7 +7265,10 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
         Coordination::Error code = zookeeper.tryMulti(ops, responses);
 
         if (code == Coordination::Error::ZOK)
-            delimiting_block_lock->assumeUnlocked();
+        {
+            for (auto & lock : delimiting_block_locks)
+                lock.assumeUnlocked();
+        }
         else if (code == Coordination::Error::ZBADVERSION)
         {
             /// Cannot retry automatically, because some zookeeper ops were lost on the first attempt. Will retry on DDLWorker-level.
@@ -7231,15 +7281,31 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
         else
             zkutil::KeeperMultiException::check(code, ops, responses);
 
-        String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.front()).path_created;
-        entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+        assert(entries.size() == log_entry_ops_idx.size());
+        for (size_t i = 0; i < entries.size(); ++i)
+        {
+            String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses[log_entry_ops_idx[i]]).path_created;
+            entries[i]->znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
 
-        getContext()->getMergeList().cancelInPartition(getStorageID(), partition_id, drop_range_info.max_block);
+            auto drop_range_info = MergeTreePartInfo::fromPartName(entries[i]->new_part_name, format_version);
+            getContext()->getMergeList().cancelInPartition(getStorageID(), drop_range_info.partition_id, drop_range_info.max_block);
+        }
 
-        return true;
+        return;
     }
     throw Exception(ErrorCodes::CANNOT_ASSIGN_ALTER,
-        "Cannot assign ALTER PARTITION because another ALTER PARTITION query was concurrently executed");
+                    "Cannot assign ALTER PARTITION because another ALTER PARTITION query was concurrently executed");
+}
+
+StorageReplicatedMergeTree::LogEntryPtr StorageReplicatedMergeTree::dropAllPartsInPartition(
+    zkutil::ZooKeeper & zookeeper, const String & partition_id, ContextPtr query_context, bool detach)
+{
+    Strings partition_ids = {partition_id};
+    std::vector<LogEntryPtr> entries;
+    dropAllPartsInPartitions(zookeeper, partition_ids, entries, query_context, detach);
+    if (entries.empty())
+        return {};
+    return entries[0];
 }
 
 void StorageReplicatedMergeTree::enqueuePartForCheck(const String & part_name, time_t delay_to_check_seconds)
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 54c2e928b22..ce240b4e59e 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -723,8 +723,19 @@ private:
     /// Info about how other replicas can access this one.
     ReplicatedMergeTreeAddress getReplicatedMergeTreeAddress() const;
 
-    bool dropAllPartsInPartition(
-        zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, ContextPtr query_context, bool detach);
+    bool addOpsToDropAllPartsInPartition(
+        zkutil::ZooKeeper & zookeeper, const String & partition_id, bool detach,
+        Coordination::Requests & ops, std::vector<LogEntryPtr> & entries,
+        std::vector<EphemeralLockInZooKeeper> & delimiting_block_locks,
+        std::vector<size_t> & log_entry_ops_idx);
+    void dropAllPartsInPartitions(
+        zkutil::ZooKeeper & zookeeper, const Strings partition_ids, std::vector<LogEntryPtr> & entries, ContextPtr query_context, bool detach);
+
+    LogEntryPtr dropAllPartsInPartition(
+        zkutil::ZooKeeper & zookeeper, const String & partition_id, ContextPtr query_context, bool detach);
+
+
+    void dropAllPartitionsImpl(const zkutil::ZooKeeperPtr & zookeeper, bool detach, ContextPtr query_context);
 
     void dropPartNoWaitNoThrow(const String & part_name) override;
     void dropPart(const String & part_name, bool detach, ContextPtr query_context) override;
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 301f33cb309..6107c1a5117 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -469,6 +469,11 @@ public:
         writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
+    void onException() override
+    {
+        write_buf->finalize();
+    }
+
     void onFinish() override
     {
         try
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index 453b02ad5a1..cac5b3c270f 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -120,7 +120,7 @@ private:
 
     Poco::Logger * log = &Poco::Logger::get("StorageS3Source");
 
-    /// Recreate ReadBuffer and BlockInputStream for each file.
+    /// Recreate ReadBuffer and Pipeline for each file.
     bool initialize();
 
     std::unique_ptr<ReadBuffer> createS3ReadBuffer(const String & key);
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 35752835581..03bd1d5e7d9 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -442,6 +442,11 @@ void StorageURLSink::consume(Chunk chunk)
     writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
 }
 
+void StorageURLSink::onException()
+{
+    write_buf->finalize();
+}
+
 void StorageURLSink::onFinish()
 {
     writer->finalize();
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 896db0d7211..25b88a827b6 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -114,6 +114,7 @@ public:
 
     std::string getName() const override { return "StorageURLSink"; }
     void consume(Chunk chunk) override;
+    void onException() override;
     void onFinish() override;
 
 private:
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index 975742cb771..79bf96a25cf 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -405,8 +405,7 @@ UInt32 StorageWindowView::getCleanupBound()
                 return 0;
             if (allowed_lateness)
             {
-                UInt32 lateness_bound = addTime(
-                    max_timestamp, lateness_kind, -1 * lateness_num_units, *time_zone);
+                UInt32 lateness_bound = addTime(max_timestamp, lateness_kind, -lateness_num_units, *time_zone);
                 lateness_bound = getWindowLowerBound(lateness_bound);
                 if (lateness_bound < w_bound)
                     w_bound = lateness_bound;
@@ -460,7 +459,7 @@ bool StorageWindowView::optimize(
 
 std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
 {
-    UInt32 w_start = addTime(watermark, window_kind, -1 * window_num_units, *time_zone);
+    UInt32 w_start = addTime(watermark, window_kind, -window_num_units, *time_zone);
 
     InterpreterSelectQuery fetch(
         getFetchColumnQuery(w_start, watermark),
@@ -797,13 +796,7 @@ std::shared_ptr<ASTCreateQuery> StorageWindowView::getInnerTableCreateQuery(
 
 UInt32 StorageWindowView::getWindowLowerBound(UInt32 time_sec)
 {
-    IntervalKind window_interval_kind;
-    if (is_tumble)
-        window_interval_kind = window_kind;
-    else
-        window_interval_kind = hop_kind;
-
-    switch (window_interval_kind)
+    switch (slide_kind)
     {
         case IntervalKind::Nanosecond:
         case IntervalKind::Microsecond:
@@ -818,7 +811,7 @@ UInt32 StorageWindowView::getWindowLowerBound(UInt32 time_sec)
         {\
             UInt32 w_start = ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, hop_num_units, *time_zone); \
             UInt32 w_end = AddTime<IntervalKind::KIND>::execute(w_start, hop_num_units, *time_zone);\
-            return AddTime<IntervalKind::KIND>::execute(w_end, -1 * window_num_units, *time_zone);\
+            return AddTime<IntervalKind::KIND>::execute(w_end, -window_num_units, *time_zone);\
         }\
     }
         CASE_WINDOW_KIND(Second)
@@ -836,13 +829,7 @@ UInt32 StorageWindowView::getWindowLowerBound(UInt32 time_sec)
 
 UInt32 StorageWindowView::getWindowUpperBound(UInt32 time_sec)
 {
-    IntervalKind window_interval_kind;
-    if (is_tumble)
-        window_interval_kind = window_kind;
-    else
-        window_interval_kind = hop_kind;
-
-    switch (window_interval_kind)
+    switch (slide_kind)
     {
         case IntervalKind::Nanosecond:
         case IntervalKind::Microsecond:
@@ -852,16 +839,8 @@ UInt32 StorageWindowView::getWindowUpperBound(UInt32 time_sec)
 #define CASE_WINDOW_KIND(KIND) \
     case IntervalKind::KIND: \
     { \
-        if (is_tumble) \
-        {\
-            UInt32 w_start = ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, window_num_units, *time_zone); \
-            return AddTime<IntervalKind::KIND>::execute(w_start, window_num_units, *time_zone); \
-        }\
-        else \
-        {\
-            UInt32 w_start = ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, hop_num_units, *time_zone); \
-            return AddTime<IntervalKind::KIND>::execute(w_start, hop_num_units, *time_zone); \
-        }\
+        UInt32 w_start = ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, slide_num_units, *time_zone); \
+        return AddTime<IntervalKind::KIND>::execute(w_start, slide_num_units, *time_zone); \
     }
         CASE_WINDOW_KIND(Second)
         CASE_WINDOW_KIND(Minute)
@@ -903,10 +882,7 @@ void StorageWindowView::updateMaxWatermark(UInt32 watermark)
         {
             fire_signal.push_back(max_watermark);
             max_fired_watermark = max_watermark;
-            max_watermark
-                = is_tumble
-                ? addTime(max_watermark, window_kind, window_num_units, *time_zone)
-                : addTime(max_watermark, hop_kind, hop_num_units, *time_zone);
+            max_watermark = addTime(max_watermark, slide_kind, slide_num_units, *time_zone);
         }
     }
     else // strictly || bounded
@@ -917,16 +893,8 @@ void StorageWindowView::updateMaxWatermark(UInt32 watermark)
         {
             fire_signal.push_back(max_watermark);
             max_fired_watermark = max_watermark;
-            if (is_tumble)
-            {
-                max_watermark = addTime(max_watermark, window_kind, window_num_units, *time_zone);
-                max_watermark_bias = addTime(max_watermark, window_kind, window_num_units, *time_zone);
-            }
-            else
-            {
-                max_watermark = addTime(max_watermark, hop_kind, hop_num_units, *time_zone);
-                max_watermark_bias = addTime(max_watermark, hop_kind, hop_num_units, *time_zone);
-            }
+            max_watermark = addTime(max_watermark, slide_kind, slide_num_units, *time_zone);
+            max_watermark_bias = addTime(max_watermark, slide_kind, slide_num_units, *time_zone);
         }
     }
 
@@ -962,38 +930,32 @@ void StorageWindowView::threadFuncCleanup()
 
 void StorageWindowView::threadFuncFireProc()
 {
-    static bool window_kind_larger_than_day = window_kind == IntervalKind::Week || window_kind == IntervalKind::Month
-        || window_kind == IntervalKind::Quarter || window_kind == IntervalKind::Year;
-
     std::unique_lock lock(fire_signal_mutex);
     UInt32 timestamp_now = std::time(nullptr);
 
-    /// When window kind is larger than day, getWindowUpperBound() will get a day num instead of timestamp,
-    /// and addTime will also add day num to the next_fire_signal, so we need to convert it into timestamp.
-    /// Otherwise, we will get wrong result and after create window view with window kind larger than day,
-    /// since day num is too smaller than current timestamp, it will fire a lot.
-    auto exact_fire_signal = window_kind_larger_than_day ? next_fire_signal * 86400 : next_fire_signal;
-
-    while (exact_fire_signal <= timestamp_now)
+    while (next_fire_signal <= timestamp_now)
     {
         try
         {
-            fire(exact_fire_signal);
+            fire(next_fire_signal);
         }
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
-        max_fired_watermark = exact_fire_signal;
-        next_fire_signal = addTime(next_fire_signal, window_kind, window_num_units, *time_zone);
-        exact_fire_signal = window_kind_larger_than_day ? next_fire_signal * 86400 : next_fire_signal;
+        max_fired_watermark = next_fire_signal;
+        auto slide_interval = addTime(0, slide_kind, slide_num_units, *time_zone);
+        /// Convert DayNum into seconds when the slide interval is larger than Day
+        if (slide_kind > IntervalKind::Day)
+            slide_interval *= 86400;
+        next_fire_signal += slide_interval;
     }
 
     UInt64 timestamp_ms = static_cast<UInt64>(Poco::Timestamp().epochMicroseconds()) / 1000;
     if (!shutdown_called)
         fire_task->scheduleAfter(std::max(
             UInt64(0),
-            static_cast<UInt64>(window_kind_larger_than_day ? next_fire_signal * 86400 : next_fire_signal) * 1000 - timestamp_ms));
+            static_cast<UInt64>(next_fire_signal) * 1000 - timestamp_ms));
 }
 
 void StorageWindowView::threadFuncFireEvent()
@@ -1184,6 +1146,9 @@ ASTPtr StorageWindowView::innerQueryParser(const ASTSelectQuery & query)
         arguments.at(1), window_kind, window_num_units,
         "Illegal type of second argument of function " + window_function.name + " should be Interval");
 
+    slide_kind = window_kind;
+    slide_num_units = window_num_units;
+
     if (!is_tumble)
     {
         hop_kind = window_kind;
@@ -1274,17 +1239,12 @@ void StorageWindowView::writeIntoWindowView(
     // Filter outdated data
     if (window_view.allowed_lateness && t_max_timestamp != 0)
     {
-        lateness_bound = addTime(
-            t_max_timestamp, window_view.lateness_kind,
-            -1 * window_view.lateness_num_units, *window_view.time_zone);
+        lateness_bound = addTime(t_max_timestamp, window_view.lateness_kind, -window_view.lateness_num_units, *window_view.time_zone);
 
         if (window_view.is_watermark_bounded)
         {
-            UInt32 watermark_lower_bound = window_view.is_tumble
-                ? addTime(t_max_watermark, window_view.window_kind,
-                          -1 * window_view.window_num_units, *window_view.time_zone)
-                : addTime(t_max_watermark, window_view.hop_kind,
-                          -1 * window_view.hop_num_units, *window_view.time_zone);
+            UInt32 watermark_lower_bound
+                = addTime(t_max_watermark, window_view.slide_kind, -window_view.slide_num_units, *window_view.time_zone);
 
             if (watermark_lower_bound < lateness_bound)
                 lateness_bound = watermark_lower_bound;
@@ -1555,7 +1515,7 @@ ASTPtr StorageWindowView::getFetchColumnQuery(UInt32 w_start, UInt32 w_end) cons
             /// windows will split into [1], [2], [3]... We compute each split window into
             /// mergeable state and merge them when the window is triggering.
             func_array ->arguments->children.push_back(std::make_shared<ASTLiteral>(w_end));
-            w_end = addTime(w_end, window_kind, -1 * slice_num_units, *time_zone);
+            w_end = addTime(w_end, window_kind, -slice_num_units, *time_zone);
         }
         auto func_has = makeASTFunction("has", func_array, std::make_shared<ASTIdentifier>(window_id_name));
         res_query->setExpression(ASTSelectQuery::Expression::PREWHERE, func_has);
diff --git a/src/Storages/WindowView/StorageWindowView.h b/src/Storages/WindowView/StorageWindowView.h
index f7b6035b241..87b0d84c12d 100644
--- a/src/Storages/WindowView/StorageWindowView.h
+++ b/src/Storages/WindowView/StorageWindowView.h
@@ -198,11 +198,13 @@ private:
     IntervalKind::Kind hop_kind;
     IntervalKind::Kind watermark_kind;
     IntervalKind::Kind lateness_kind;
+    IntervalKind::Kind slide_kind;
     Int64 window_num_units;
     Int64 hop_num_units;
     Int64 slice_num_units;
     Int64 watermark_num_units = 0;
     Int64 lateness_num_units = 0;
+    Int64 slide_num_units;
     String window_id_name;
     String window_id_alias;
     String window_column_name;
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 1f8d72b68d7..f06831f191e 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -201,11 +201,10 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
     if (!cluster_name.empty())
     {
         /// Use an existing cluster from the main config
-        String cluster_name_expanded = context->getMacros()->expand(cluster_name);
         if (name != "clusterAllReplicas")
-            cluster = context->getCluster(cluster_name_expanded);
+            cluster = context->getCluster(cluster_name);
         else
-            cluster = context->getCluster(cluster_name_expanded)->getClusterWithReplicasAsShards(context->getSettingsRef());
+            cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
     }
     else
     {
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index a4847f33d45..c9915c1c7f4 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -38,16 +38,17 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False,
         },
-        "binary_gcc": {
-            "compiler": "gcc-11",
-            "build_type": "",
-            "sanitizer": "",
-            "package_type": "binary",
-            "bundled": "bundled",
-            "splitted": "unsplitted",
-            "tidy": "disable",
-            "with_coverage": False,
-        },
+        # FIXME update to gcc-12 and turn on
+        # "binary_gcc": {
+        #     "compiler": "gcc-11",
+        #     "build_type": "",
+        #     "sanitizer": "",
+        #     "package_type": "binary",
+        #     "bundled": "bundled",
+        #     "splitted": "unsplitted",
+        #     "tidy": "disable",
+        #     "with_coverage": False,
+        # },
         "package_aarch64": {
             "compiler": "clang-13-aarch64",
             "build_type": "",
@@ -217,7 +218,7 @@ CI_CONFIG = {
             "binary_freebsd",
             "binary_darwin_aarch64",
             "binary_ppc64le",
-            "binary_gcc",
+            # "binary_gcc",
         ],
     },
     "tests_config": {
@@ -323,9 +324,9 @@ CI_CONFIG = {
         "Testflows check (actions)": {
             "required_build": "package_release",
         },
-        "Unit tests (release-gcc, actions)": {
-            "required_build": "binary_gcc",
-        },
+        # "Unit tests (release-gcc, actions)": {
+        #     "required_build": "binary_gcc",
+        # },
         "Unit tests (release-clang, actions)": {
             "required_build": "binary_release",
         },
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index d659245dad9..acc07ccfb23 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -84,7 +84,6 @@ if __name__ == "__main__":
     stopwatch = Stopwatch()
 
     temp_path = TEMP_PATH
-    caches_path = CACHES_PATH
 
     if not os.path.exists(temp_path):
         os.makedirs(temp_path)
@@ -110,7 +109,10 @@ if __name__ == "__main__":
     if not os.path.exists(output_path):
         os.makedirs(output_path)
 
-    cache_path = os.path.join(caches_path, "fasttest")
+    if not os.path.exists(CACHES_PATH):
+        os.makedirs(CACHES_PATH)
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {CACHES_PATH}", shell=True)
+    cache_path = os.path.join(CACHES_PATH, "fasttest")
 
     logging.info("Will try to fetch cache for our build")
     ccache_for_pr = get_ccache_if_not_exists(
diff --git a/tests/ci/git_helper.py b/tests/ci/git_helper.py
index 0921ace35f6..e3ad0eb39c0 100644
--- a/tests/ci/git_helper.py
+++ b/tests/ci/git_helper.py
@@ -52,11 +52,11 @@ class Runner:
     def __init__(self, cwd: str = CWD):
         self._cwd = cwd
 
-    def run(self, cmd: str, cwd: Optional[str] = None) -> str:
+    def run(self, cmd: str, cwd: Optional[str] = None, **kwargs) -> str:
         if cwd is None:
             cwd = self.cwd
         return subprocess.check_output(
-            cmd, shell=True, cwd=cwd, encoding="utf-8"
+            cmd, shell=True, cwd=cwd, encoding="utf-8", **kwargs
         ).strip()
 
     @property
@@ -78,8 +78,12 @@ git_runner.cwd = p.relpath(
 )
 
 
+def is_shallow() -> bool:
+    return git_runner.run("git rev-parse --is-shallow-repository") == "true"
+
+
 def get_tags() -> List[str]:
-    if git_runner.run("git rev-parse --is-shallow-repository") == "true":
+    if is_shallow():
         raise RuntimeError("attempt to run on a shallow repository")
     return git_runner.run("git tag").split()
 
@@ -110,10 +114,7 @@ class Git:
         self.sha_short = self.sha[:11]
         # The following command shows the most recent tag in a graph
         # Format should match TAG_REGEXP
-        if (
-            self._ignore_no_tags
-            and self.run("git rev-parse --is-shallow-repository") == "true"
-        ):
+        if self._ignore_no_tags and is_shallow():
             try:
                 self._update_tags()
             except subprocess.CalledProcessError:
diff --git a/tests/ci/integration_test_check.py b/tests/ci/integration_test_check.py
index 517a94544f9..cf0dfe51e9b 100644
--- a/tests/ci/integration_test_check.py
+++ b/tests/ci/integration_test_check.py
@@ -210,22 +210,29 @@ if __name__ == "__main__":
 
     json_path = os.path.join(work_path, "params.json")
     with open(json_path, "w", encoding="utf-8") as json_params:
-        json_params.write(
-            json.dumps(
-                get_json_params_dict(
-                    check_name,
-                    pr_info,
-                    images_with_versions,
-                    run_by_hash_total,
-                    run_by_hash_num,
-                )
+        params_text = json.dumps(
+            get_json_params_dict(
+                check_name,
+                pr_info,
+                images_with_versions,
+                run_by_hash_total,
+                run_by_hash_num,
             )
         )
+        json_params.write(params_text)
+        logging.info("Parameters file %s is written: %s", json_path, params_text)
 
     output_path_log = os.path.join(result_path, "main_script_log.txt")
 
     runner_path = os.path.join(repo_path, "tests/integration", "ci-runner.py")
     run_command = f"sudo -E {runner_path} | tee {output_path_log}"
+    logging.info("Going to run command: `%s`", run_command)
+    logging.info(
+        "ENV parameters for runner:\n%s",
+        "\n".join(
+            [f"{k}={v}" for k, v in my_env.items() if k.startswith("CLICKHOUSE_")]
+        ),
+    )
 
     with TeePopen(run_command, output_path_log, my_env) as process:
         retcode = process.wait()
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index 5221f2a2fae..9d287d2a07e 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -220,7 +220,7 @@ class PRInfo:
         else:
             diff_object = PatchSet(response.text)
             self.changed_files = {f.path for f in diff_object}
-        print("Fetched info about %d changed files", len(self.changed_files))
+        print("Fetched info about %d changed files" % len(self.changed_files))
 
     def get_dict(self):
         return {
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index cde66c510eb..cff6c2de799 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -86,9 +86,14 @@ class HTTPError(Exception):
 def clickhouse_execute_http(
     base_args, query, timeout=30, settings=None, default_format=None
 ):
-    client = http.client.HTTPConnection(
-        host=base_args.tcp_host, port=base_args.http_port, timeout=timeout
-    )
+    if args.secure:
+        client = http.client.HTTPSConnection(
+            host=base_args.tcp_host, port=base_args.http_port, timeout=timeout
+        )
+    else:
+        client = http.client.HTTPConnection(
+            host=base_args.tcp_host, port=base_args.http_port, timeout=timeout
+        )
 
     timeout = int(timeout)
     params = {
@@ -921,6 +926,7 @@ class TestCase:
             "test": self.case_file,
             "stdout": self.stdout_file,
             "stderr": self.stderr_file,
+            "secure": "--secure" if args.secure else ""
         }
 
         # >> append to stderr (but not stdout since it is not used there),
@@ -932,7 +938,7 @@ class TestCase:
 
         if self.ext == ".sql":
             pattern = (
-                "{client} --send_logs_level={logs_level} --multiquery {options} < "
+                "{client} --send_logs_level={logs_level} {secure} --multiquery {options} < "
                 + pattern
             )
 
@@ -1252,7 +1258,11 @@ class TestSuite:
     @staticmethod
     def read_test_suite(args, suite_dir_name: str):
         def is_data_present():
-            return int(clickhouse_execute(args, "EXISTS TABLE test.hits"))
+            try:
+                return int(clickhouse_execute(args, "EXISTS TABLE test.hits"))
+            except Exception as e:
+                print("Cannot check if dataset is available, assuming it's not: ", str(e))
+                return False
 
         base_dir = os.path.abspath(args.queries)
         tmp_dir = os.path.abspath(args.tmp)
@@ -1417,7 +1427,7 @@ def run_tests_array(all_tests_with_params: Tuple[List[str], int, TestSuite]):
             stop_tests()
             raise e
 
-        if failures_chain >= 20:
+        if failures_chain >= args.max_failures_chain:
             stop_tests()
             break
 
@@ -2049,6 +2059,18 @@ if __name__ == "__main__":
         help="Run tests for further backwoard compatibility testing by ignoring all"
         "drop queries in tests for collecting data from new version of server",
     )
+    parser.add_argument(
+        "--secure",
+        action="store_true",
+        default=False,
+        help="Use secure connection to connect to clickhouse-server",
+    )
+    parser.add_argument(
+        "--max-failures-chain",
+        default=20,
+        type=int,
+        help="Max number of failed tests in a row (stop tests if higher)",
+    )
     args = parser.parse_args()
 
     if args.queries and not os.path.isdir(args.queries):
@@ -2126,13 +2148,18 @@ if __name__ == "__main__":
         args.tcp_port = int(tcp_port)
         args.client += f" --port={tcp_port}"
     else:
-        args.tcp_port = 9000
+        args.tcp_port = 9440 if args.secure else 9000
+        if args.secure:
+            os.environ["CLICKHOUSE_PORT_TCP"] = str(args.tcp_port)
 
     http_port = os.getenv("CLICKHOUSE_PORT_HTTP")
     if http_port is not None:
         args.http_port = int(http_port)
     else:
-        args.http_port = 8123
+        args.http_port = 8443 if args.secure else 8123
+        os.environ["CLICKHOUSE_PORT_HTTP"] = str(args.http_port)
+        if args.secure and os.getenv("CLICKHOUSE_PORT_HTTP_PROTO") is None:
+            os.environ["CLICKHOUSE_PORT_HTTP_PROTO"] = "https"
 
     client_database = os.getenv("CLICKHOUSE_DATABASE")
     if client_database is not None:
@@ -2144,7 +2171,7 @@ if __name__ == "__main__":
     if args.backward_compatibility_check:
         args.client += " --fake-drop"
 
-    if args.client_option:
+    if args.client_option or args.secure:
         # Set options for client
         if "CLICKHOUSE_CLIENT_OPT" in os.environ:
             os.environ["CLICKHOUSE_CLIENT_OPT"] += " "
@@ -2152,6 +2179,8 @@ if __name__ == "__main__":
             os.environ["CLICKHOUSE_CLIENT_OPT"] = ""
 
         os.environ["CLICKHOUSE_CLIENT_OPT"] += get_additional_client_options(args)
+        if args.secure:
+            os.environ["CLICKHOUSE_CLIENT_OPT"] += " --secure "
 
         # Set options for curl
         if "CLICKHOUSE_URL_PARAMS" in os.environ:
diff --git a/tests/config/config.d/enable_access_control_improvements.xml b/tests/config/config.d/enable_access_control_improvements.xml
new file mode 100644
index 00000000000..44fc8f7b996
--- /dev/null
+++ b/tests/config/config.d/enable_access_control_improvements.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <access_control_improvements>
+        <users_without_row_policies_can_read_rows>true</users_without_row_policies_can_read_rows>
+    </access_control_improvements>
+</clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index e7e3de1e275..3bc1967ab1f 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -19,6 +19,7 @@ ln -sf $SRC_PATH/config.d/zookeeper.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/listen.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/text_log.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/custom_settings_prefixes.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/enable_access_control_improvements.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/macros.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/disks.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/secure_ports.xml $DEST_SERVER_PATH/config.d/
diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
index 687c88b04a3..20787786aa4 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/integration/ci-runner.py
@@ -246,8 +246,7 @@ class ClickhouseIntegrationTestsRunner:
             return name + ":latest"
         return name
 
-    def get_single_image_version(self):
-        name = self.get_images_names()[0]
+    def get_image_version(self, name: str):
         if name in self.image_versions:
             return self.image_versions[name]
         logging.warn(
@@ -473,7 +472,7 @@ class ClickhouseIntegrationTestsRunner:
         ):
             for img in self.get_images_names():
                 if img == "clickhouse/integration-tests-runner":
-                    runner_version = self.get_single_image_version()
+                    runner_version = self.get_image_version(img)
                     logging.info(
                         "Can run with custom docker image version %s", runner_version
                     )
diff --git a/tests/integration/helpers/0_common_instance_config.xml b/tests/integration/helpers/0_common_instance_config.xml
index 493366b1209..b6ea21648bb 100644
--- a/tests/integration/helpers/0_common_instance_config.xml
+++ b/tests/integration/helpers/0_common_instance_config.xml
@@ -18,4 +18,8 @@
         <stdout>/var/log/clickhouse-server/stdout.log</stdout>
         <rotateOnOpen>true</rotateOnOpen>
     </logger>
+
+    <access_control_improvements>
+        <users_without_row_policies_can_read_rows>true</users_without_row_policies_can_read_rows>
+    </access_control_improvements>
 </clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/__init__.py b/tests/integration/test_disabled_access_control_improvements/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_disabled_access_control_improvements/all_rows.xml b/tests/integration/test_disabled_access_control_improvements/all_rows.xml
new file mode 100644
index 00000000000..948aed1a874
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/all_rows.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <users>
+        <default>
+            <!-- Allows all rows -->
+            <databases>
+                <mydb>
+                    <filtered_table1>
+                        <filter>1</filter>
+                    </filtered_table1>
+
+                    <filtered_table2>
+                        <filter>1</filter>
+                    </filtered_table2>
+
+                    <filtered_table3>
+                        <filter>1</filter>
+                    </filtered_table3>
+                </mydb>
+            </databases>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/configs/config.d/disable_access_control_improvements.xml b/tests/integration/test_disabled_access_control_improvements/configs/config.d/disable_access_control_improvements.xml
new file mode 100644
index 00000000000..0192e211b68
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/configs/config.d/disable_access_control_improvements.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <access_control_improvements>
+        <users_without_row_policies_can_read_rows remove="remove"/>
+    </access_control_improvements>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml b/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml
new file mode 100644
index 00000000000..19249011968
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/configs/users.d/another_user.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <profiles>
+        <default>
+            <optimize_on_insert>0</optimize_on_insert>
+        </default>
+    </profiles>
+    <users>
+        <another>
+            <password/>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </another>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/configs/users.d/row_policy.xml b/tests/integration/test_disabled_access_control_improvements/configs/users.d/row_policy.xml
new file mode 120000
index 00000000000..593f0e42662
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/configs/users.d/row_policy.xml
@@ -0,0 +1 @@
+../../normal_filters.xml
\ No newline at end of file
diff --git a/tests/integration/test_disabled_access_control_improvements/configs/users.xml b/tests/integration/test_disabled_access_control_improvements/configs/users.xml
new file mode 100644
index 00000000000..5dc65384a2d
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/configs/users.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+        <another>
+            <password/>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </another>
+    </users>
+    <quotas>
+        <default/>
+    </quotas>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/no_filters.xml b/tests/integration/test_disabled_access_control_improvements/no_filters.xml
new file mode 100644
index 00000000000..fddc67fc3f9
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/no_filters.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<clickhouse>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/no_rows.xml b/tests/integration/test_disabled_access_control_improvements/no_rows.xml
new file mode 100644
index 00000000000..760203210b2
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/no_rows.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <users>
+        <default>
+            <!-- Allows no rows -->
+            <databases>
+                <mydb>
+                    <filtered_table1>
+                        <filter>NULL</filter>
+                    </filtered_table1>
+
+                    <filtered_table2>
+                        <filter>NULL</filter>
+                    </filtered_table2>
+
+                    <filtered_table3>
+                        <filter>NULL</filter>
+                    </filtered_table3>
+                </mydb>
+            </databases>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/normal_filters.xml b/tests/integration/test_disabled_access_control_improvements/normal_filters.xml
new file mode 100644
index 00000000000..6f5cd8701f6
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/normal_filters.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <users>
+        <default>
+            <!-- For testing the table filters -->
+            <databases>
+                <mydb>
+                    <!-- Simple expression filter -->
+                    <filtered_table1>
+                        <filter>a = 1</filter>
+                    </filtered_table1>
+
+                    <!-- Complex expression filter -->
+                    <filtered_table2>
+                        <filter>a + b &lt; 1 or c - d &gt; 5</filter>
+                    </filtered_table2>
+
+                    <!-- Filter with ALIAS column -->
+                    <filtered_table3>
+                        <filter>c = 1</filter>
+                    </filtered_table3>
+                </mydb>
+            </databases>
+        </default>
+        <another>
+            <!-- For testing the table filters -->
+            <databases>
+                <mydb>
+                    <local>
+                        <filter>a = 1</filter>
+                    </local>
+                </mydb>
+            </databases>
+        </another>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/test_row_policy.py b/tests/integration/test_disabled_access_control_improvements/test_row_policy.py
new file mode 100644
index 00000000000..509b4de1a37
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/test_row_policy.py
@@ -0,0 +1,418 @@
+import os
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/config.d/disable_access_control_improvements.xml"],
+    user_configs=[
+        "configs/users.d/row_policy.xml",
+        "configs/users.d/another_user.xml",
+    ],
+)
+
+
+def copy_policy_xml(local_file_name):
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+    node.copy_file_to_container(
+        os.path.join(script_dir, local_file_name),
+        "/etc/clickhouse-server/users.d/row_policy.xml",
+    )
+    node.query("SYSTEM RELOAD CONFIG")
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+
+        node.query(
+            """
+            CREATE DATABASE mydb;
+
+            CREATE TABLE mydb.filtered_table1 (a UInt8, b UInt8) ENGINE MergeTree ORDER BY a;
+            INSERT INTO mydb.filtered_table1 values (0, 0), (0, 1), (1, 0), (1, 1);
+
+            CREATE TABLE mydb.table (a UInt8, b UInt8) ENGINE MergeTree ORDER BY a;
+            INSERT INTO mydb.table values (0, 0), (0, 1), (1, 0), (1, 1);
+
+            CREATE TABLE mydb.filtered_table2 (a UInt8, b UInt8, c UInt8, d UInt8) ENGINE MergeTree ORDER BY a;
+            INSERT INTO mydb.filtered_table2 values (0, 0, 0, 0), (1, 2, 3, 4), (4, 3, 2, 1), (0, 0, 6, 0);
+
+            CREATE TABLE mydb.filtered_table3 (a UInt8, b UInt8, c UInt16 ALIAS a + b) ENGINE MergeTree ORDER BY a;
+            INSERT INTO mydb.filtered_table3 values (0, 0), (0, 1), (1, 0), (1, 1);
+
+            CREATE TABLE mydb.`.filtered_table4` (a UInt8, b UInt8, c UInt16 ALIAS a + b) ENGINE MergeTree ORDER BY a;
+            INSERT INTO mydb.`.filtered_table4` values (0, 0), (0, 1), (1, 0), (1, 1);
+
+            CREATE TABLE mydb.local (a UInt8, b UInt8) ENGINE MergeTree ORDER BY a;
+        """
+        )
+
+        node.query("INSERT INTO mydb.local values (2, 0), (2, 1), (1, 0), (1, 1)")
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def reset_policies():
+    try:
+        yield
+    finally:
+        copy_policy_xml("normal_filters.xml")
+        node.query("DROP POLICY IF EXISTS pA, pB ON mydb.filtered_table1")
+
+
+def test_introspection():
+    policies = [
+        [
+            "another ON mydb.filtered_table1",
+            "another",
+            "mydb",
+            "filtered_table1",
+            "6068883a-0e9d-f802-7e22-0144f8e66d3c",
+            "users.xml",
+            "1",
+            0,
+            0,
+            "['another']",
+            "[]",
+        ],
+        [
+            "another ON mydb.filtered_table2",
+            "another",
+            "mydb",
+            "filtered_table2",
+            "c019e957-c60b-d54e-cc52-7c90dac5fb01",
+            "users.xml",
+            "1",
+            0,
+            0,
+            "['another']",
+            "[]",
+        ],
+        [
+            "another ON mydb.filtered_table3",
+            "another",
+            "mydb",
+            "filtered_table3",
+            "4cb080d0-44e8-dbef-6026-346655143628",
+            "users.xml",
+            "1",
+            0,
+            0,
+            "['another']",
+            "[]",
+        ],
+        [
+            "another ON mydb.local",
+            "another",
+            "mydb",
+            "local",
+            "5b23c389-7e18-06bf-a6bc-dd1afbbc0a97",
+            "users.xml",
+            "a = 1",
+            0,
+            0,
+            "['another']",
+            "[]",
+        ],
+        [
+            "default ON mydb.filtered_table1",
+            "default",
+            "mydb",
+            "filtered_table1",
+            "9e8a8f62-4965-2b5e-8599-57c7b99b3549",
+            "users.xml",
+            "a = 1",
+            0,
+            0,
+            "['default']",
+            "[]",
+        ],
+        [
+            "default ON mydb.filtered_table2",
+            "default",
+            "mydb",
+            "filtered_table2",
+            "cffae79d-b9bf-a2ef-b798-019c18470b25",
+            "users.xml",
+            "a + b < 1 or c - d > 5",
+            0,
+            0,
+            "['default']",
+            "[]",
+        ],
+        [
+            "default ON mydb.filtered_table3",
+            "default",
+            "mydb",
+            "filtered_table3",
+            "12fc5cef-e3da-3940-ec79-d8be3911f42b",
+            "users.xml",
+            "c = 1",
+            0,
+            0,
+            "['default']",
+            "[]",
+        ],
+        [
+            "default ON mydb.local",
+            "default",
+            "mydb",
+            "local",
+            "cdacaeb5-1d97-f99d-2bb0-4574f290629c",
+            "users.xml",
+            "1",
+            0,
+            0,
+            "['default']",
+            "[]",
+        ],
+    ]
+    assert node.query(
+        "SELECT * from system.row_policies ORDER BY short_name, database, table"
+    ) == TSV(policies)
+
+
+def test_dcl_introspection():
+    assert node.query("SHOW POLICIES") == TSV(
+        [
+            "another ON mydb.filtered_table1",
+            "another ON mydb.filtered_table2",
+            "another ON mydb.filtered_table3",
+            "another ON mydb.local",
+            "default ON mydb.filtered_table1",
+            "default ON mydb.filtered_table2",
+            "default ON mydb.filtered_table3",
+            "default ON mydb.local",
+        ]
+    )
+
+    assert node.query("SHOW POLICIES ON mydb.filtered_table1") == TSV(
+        ["another", "default"]
+    )
+    assert node.query("SHOW POLICIES ON mydb.local") == TSV(["another", "default"])
+    assert node.query("SHOW POLICIES ON mydb.*") == TSV(
+        [
+            "another ON mydb.filtered_table1",
+            "another ON mydb.filtered_table2",
+            "another ON mydb.filtered_table3",
+            "another ON mydb.local",
+            "default ON mydb.filtered_table1",
+            "default ON mydb.filtered_table2",
+            "default ON mydb.filtered_table3",
+            "default ON mydb.local",
+        ]
+    )
+    assert node.query("SHOW POLICIES default") == TSV(
+        [
+            "default ON mydb.filtered_table1",
+            "default ON mydb.filtered_table2",
+            "default ON mydb.filtered_table3",
+            "default ON mydb.local",
+        ]
+    )
+
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table1")
+        == "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table2")
+        == "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table3")
+        == "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.local")
+        == "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default\n"
+    )
+
+    assert node.query("SHOW CREATE POLICY default") == TSV(
+        [
+            "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
+            "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default",
+            "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default",
+            "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default",
+        ]
+    )
+    assert node.query("SHOW CREATE POLICIES ON mydb.filtered_table1") == TSV(
+        [
+            "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
+        ]
+    )
+    assert node.query("SHOW CREATE POLICIES ON mydb.*") == TSV(
+        [
+            "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY another ON mydb.filtered_table2 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY another ON mydb.filtered_table3 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY another ON mydb.local FOR SELECT USING a = 1 TO another",
+            "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
+            "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default",
+            "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default",
+            "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default",
+        ]
+    )
+    assert node.query("SHOW CREATE POLICIES") == TSV(
+        [
+            "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY another ON mydb.filtered_table2 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY another ON mydb.filtered_table3 FOR SELECT USING 1 TO another",
+            "CREATE ROW POLICY another ON mydb.local FOR SELECT USING a = 1 TO another",
+            "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
+            "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default",
+            "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default",
+            "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default",
+        ]
+    )
+
+    expected_access = (
+        "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another\n"
+        "CREATE ROW POLICY another ON mydb.filtered_table2 FOR SELECT USING 1 TO another\n"
+        "CREATE ROW POLICY another ON mydb.filtered_table3 FOR SELECT USING 1 TO another\n"
+        "CREATE ROW POLICY another ON mydb.local FOR SELECT USING a = 1 TO another\n"
+        "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default\n"
+        "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default\n"
+        "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default\n"
+        "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default\n"
+    )
+    assert expected_access in node.query("SHOW ACCESS")
+
+    copy_policy_xml("all_rows.xml")
+    assert node.query("SHOW POLICIES") == TSV(
+        [
+            "another ON mydb.filtered_table1",
+            "another ON mydb.filtered_table2",
+            "another ON mydb.filtered_table3",
+            "default ON mydb.filtered_table1",
+            "default ON mydb.filtered_table2",
+            "default ON mydb.filtered_table3",
+        ]
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table1")
+        == "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING 1 TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table2")
+        == "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING 1 TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table3")
+        == "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING 1 TO default\n"
+    )
+
+    copy_policy_xml("no_rows.xml")
+    assert node.query("SHOW POLICIES") == TSV(
+        [
+            "another ON mydb.filtered_table1",
+            "another ON mydb.filtered_table2",
+            "another ON mydb.filtered_table3",
+            "default ON mydb.filtered_table1",
+            "default ON mydb.filtered_table2",
+            "default ON mydb.filtered_table3",
+        ]
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table1")
+        == "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING NULL TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table2")
+        == "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING NULL TO default\n"
+    )
+    assert (
+        node.query("SHOW CREATE POLICY default ON mydb.filtered_table3")
+        == "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING NULL TO default\n"
+    )
+
+    copy_policy_xml("no_filters.xml")
+    assert node.query("SHOW POLICIES") == ""
+
+
+def test_dcl_management():
+    copy_policy_xml("no_filters.xml")
+    assert node.query("SHOW POLICIES") == ""
+
+    node.query("CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b")
+    assert node.query("SELECT * FROM mydb.filtered_table1") == ""
+    assert node.query("SHOW POLICIES ON mydb.filtered_table1") == "pA\n"
+
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 TO default")
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[0, 1]])
+    assert node.query("SHOW POLICIES ON mydb.filtered_table1") == "pA\n"
+
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 FOR SELECT USING a>b")
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 0]])
+
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 RENAME TO pB")
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 0]])
+    assert node.query("SHOW POLICIES ON mydb.filtered_table1") == "pB\n"
+    assert (
+        node.query("SHOW CREATE POLICY pB ON mydb.filtered_table1")
+        == "CREATE ROW POLICY pB ON mydb.filtered_table1 FOR SELECT USING a > b TO default\n"
+    )
+
+    node.query("DROP POLICY pB ON mydb.filtered_table1")
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV(
+        [[0, 0], [0, 1], [1, 0], [1, 1]]
+    )
+    assert node.query("SHOW POLICIES") == ""
+
+
+def test_dcl_users_with_policies_from_users_xml():
+    node.query("CREATE USER X")
+    node.query("GRANT SELECT ON mydb.filtered_table1 TO X")
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 0], [1, 1]])
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == ""
+    node.query("DROP USER X")
+
+
+def test_some_users_without_policies():
+    copy_policy_xml("no_filters.xml")
+    assert node.query("SHOW POLICIES") == ""
+    node.query("CREATE USER X, Y")
+    node.query("GRANT SELECT ON mydb.filtered_table1 TO X, Y")
+
+    # permissive a >= b for X, none for Y
+    node.query(
+        "CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a >= b AS permissive TO X"
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == ""
+
+    # restrictive a >=b for X, none for Y
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 AS restrictive")
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == ""
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == ""
+
+    # permissive a >= b for X, restrictive a <= b for X, none for Y
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 AS permissive")
+    node.query(
+        "CREATE POLICY pB ON mydb.filtered_table1 FOR SELECT USING a <= b AS restrictive TO X"
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == ""
+
+    # permissive a >= b for X, restrictive a <= b for Y
+    node.query("ALTER POLICY pB ON mydb.filtered_table1 TO Y")
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == ""
+
+    node.query("DROP POLICY pA, pB ON mydb.filtered_table1")
+    node.query("DROP USER X, Y")
diff --git a/tests/integration/test_old_parts_finally_removed/__init__.py b/tests/integration/test_old_parts_finally_removed/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_old_parts_finally_removed/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_old_parts_finally_removed/test.py b/tests/integration/test_old_parts_finally_removed/test.py
new file mode 100644
index 00000000000..108b72c5ccd
--- /dev/null
+++ b/tests/integration/test_old_parts_finally_removed/test.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+
+import os
+import time
+
+import helpers.client as client
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance("node1", with_zookeeper=True)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+
+def test_part_finally_removed(started_cluster):
+    node1.query(
+        "CREATE TABLE drop_outdated_part (Key UInt64) ENGINE = ReplicatedMergeTree('/table/d', '1') ORDER BY tuple() SETTINGS old_parts_lifetime=10, cleanup_delay_period=10, cleanup_delay_period_random_add=1"
+    )
+    node1.query("INSERT INTO drop_outdated_part VALUES (1)")
+
+    node1.query("OPTIMIZE TABLE drop_outdated_part FINAL")
+
+    node1.exec_in_container(
+        [
+            "bash",
+            "-c",
+            "chown -R root:root /var/lib/clickhouse/data/default/drop_outdated_part/all_0_0_0",
+        ],
+        privileged=True,
+        user="root",
+    )
+
+    node1.query(
+        "ALTER TABLE drop_outdated_part MODIFY SETTING old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=1"
+    )
+
+    for i in range(60):
+        if node1.contains_in_log("Cannot quickly remove directory"):
+            break
+        time.sleep(0.5)
+
+    node1.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"chown -R {os.getuid()}:{os.getgid()} /var/lib/clickhouse/data/default/drop_outdated_part/*",
+        ],
+        privileged=True,
+        user="root",
+    )
+
+    for i in range(60):
+
+        if (
+            node1.query(
+                "SELECT count() from system.parts WHERE table = 'drop_outdated_part'"
+            )
+            == "1\n"
+        ):
+            out = node1.exec_in_container(
+                [
+                    "bash",
+                    "-c",
+                    "ls /var/lib/clickhouse/data/default/drop_outdated_part | grep '_' | grep 'all'",
+                ],
+                privileged=True,
+                user="root",
+            )
+
+            assert (
+                "all_0_0_0" not in out
+            ), f"Print found part which must be deleted: {out}"
+
+            break
+        time.sleep(0.5)
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 02301236389..92c109974e1 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -825,6 +825,9 @@ def test_sync_replica(started_cluster):
                 settings=settings,
             )
 
+    # wait for host to reconnect
+    dummy_node.query_with_retry("SELECT * FROM system.zookeeper WHERE path='/'")
+
     dummy_node.query("SYSTEM SYNC DATABASE REPLICA test_sync_database")
 
     assert dummy_node.query(
@@ -834,3 +837,30 @@ def test_sync_replica(started_cluster):
     assert main_node.query(
         "SELECT count() FROM system.tables where database='test_sync_database'"
     ).strip() == str(number_of_tables)
+
+    engine_settings = {"default_table_engine": "ReplicatedMergeTree"}
+    dummy_node.query(
+        "CREATE TABLE test_sync_database.table (n int, primary key n) partition by n",
+        settings=engine_settings,
+    )
+    main_node.query("INSERT INTO test_sync_database.table SELECT * FROM numbers(10)")
+    dummy_node.query("TRUNCATE TABLE test_sync_database.table", settings=settings)
+    dummy_node.query(
+        "ALTER TABLE test_sync_database.table ADD COLUMN m int", settings=settings
+    )
+
+    main_node.query(
+        "SYSTEM SYNC DATABASE REPLICA ON CLUSTER test_sync_database test_sync_database"
+    )
+
+    lp1 = main_node.query(
+        "select value from system.zookeeper where path='/clickhouse/databases/test1/replicas/shard1|replica1' and name='log_ptr'"
+    )
+    lp2 = main_node.query(
+        "select value from system.zookeeper where path='/clickhouse/databases/test1/replicas/shard1|replica2' and name='log_ptr'"
+    )
+    max_lp = main_node.query(
+        "select value from system.zookeeper where path='/clickhouse/databases/test1/' and name='max_log_ptr'"
+    )
+    assert lp1 == max_lp
+    assert lp2 == max_lp
diff --git a/tests/integration/test_row_policy/test.py b/tests/integration/test_row_policy/test.py
index c0ebfc7a070..5a2f80c5e28 100644
--- a/tests/integration/test_row_policy/test.py
+++ b/tests/integration/test_row_policy/test.py
@@ -409,45 +409,6 @@ def test_reload_users_xml_by_timer():
 
 def test_introspection():
     policies = [
-        [
-            "another ON mydb.filtered_table1",
-            "another",
-            "mydb",
-            "filtered_table1",
-            "6068883a-0e9d-f802-7e22-0144f8e66d3c",
-            "users.xml",
-            "1",
-            0,
-            0,
-            "['another']",
-            "[]",
-        ],
-        [
-            "another ON mydb.filtered_table2",
-            "another",
-            "mydb",
-            "filtered_table2",
-            "c019e957-c60b-d54e-cc52-7c90dac5fb01",
-            "users.xml",
-            "1",
-            0,
-            0,
-            "['another']",
-            "[]",
-        ],
-        [
-            "another ON mydb.filtered_table3",
-            "another",
-            "mydb",
-            "filtered_table3",
-            "4cb080d0-44e8-dbef-6026-346655143628",
-            "users.xml",
-            "1",
-            0,
-            0,
-            "['another']",
-            "[]",
-        ],
         [
             "another ON mydb.local",
             "another",
@@ -500,19 +461,6 @@ def test_introspection():
             "['default']",
             "[]",
         ],
-        [
-            "default ON mydb.local",
-            "default",
-            "mydb",
-            "local",
-            "cdacaeb5-1d97-f99d-2bb0-4574f290629c",
-            "users.xml",
-            "1",
-            0,
-            0,
-            "['default']",
-            "[]",
-        ],
     ]
     assert node.query(
         "SELECT * from system.row_policies ORDER BY short_name, database, table"
@@ -522,31 +470,21 @@ def test_introspection():
 def test_dcl_introspection():
     assert node.query("SHOW POLICIES") == TSV(
         [
-            "another ON mydb.filtered_table1",
-            "another ON mydb.filtered_table2",
-            "another ON mydb.filtered_table3",
             "another ON mydb.local",
             "default ON mydb.filtered_table1",
             "default ON mydb.filtered_table2",
             "default ON mydb.filtered_table3",
-            "default ON mydb.local",
         ]
     )
 
-    assert node.query("SHOW POLICIES ON mydb.filtered_table1") == TSV(
-        ["another", "default"]
-    )
-    assert node.query("SHOW POLICIES ON mydb.local") == TSV(["another", "default"])
+    assert node.query("SHOW POLICIES ON mydb.filtered_table1") == TSV(["default"])
+    assert node.query("SHOW POLICIES ON mydb.local") == TSV(["another"])
     assert node.query("SHOW POLICIES ON mydb.*") == TSV(
         [
-            "another ON mydb.filtered_table1",
-            "another ON mydb.filtered_table2",
-            "another ON mydb.filtered_table3",
             "another ON mydb.local",
             "default ON mydb.filtered_table1",
             "default ON mydb.filtered_table2",
             "default ON mydb.filtered_table3",
-            "default ON mydb.local",
         ]
     )
     assert node.query("SHOW POLICIES default") == TSV(
@@ -554,7 +492,6 @@ def test_dcl_introspection():
             "default ON mydb.filtered_table1",
             "default ON mydb.filtered_table2",
             "default ON mydb.filtered_table3",
-            "default ON mydb.local",
         ]
     )
 
@@ -570,9 +507,8 @@ def test_dcl_introspection():
         node.query("SHOW CREATE POLICY default ON mydb.filtered_table3")
         == "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default\n"
     )
-    assert (
-        node.query("SHOW CREATE POLICY default ON mydb.local")
-        == "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default\n"
+    assert "no row policy" in node.query_and_get_error(
+        "SHOW CREATE POLICY default ON mydb.local"
     )
 
     assert node.query("SHOW CREATE POLICY default") == TSV(
@@ -580,58 +516,41 @@ def test_dcl_introspection():
             "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default",
-            "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default",
         ]
     )
     assert node.query("SHOW CREATE POLICIES ON mydb.filtered_table1") == TSV(
         [
-            "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another",
             "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
         ]
     )
     assert node.query("SHOW CREATE POLICIES ON mydb.*") == TSV(
         [
-            "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another",
-            "CREATE ROW POLICY another ON mydb.filtered_table2 FOR SELECT USING 1 TO another",
-            "CREATE ROW POLICY another ON mydb.filtered_table3 FOR SELECT USING 1 TO another",
             "CREATE ROW POLICY another ON mydb.local FOR SELECT USING a = 1 TO another",
             "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default",
-            "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default",
         ]
     )
     assert node.query("SHOW CREATE POLICIES") == TSV(
         [
-            "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another",
-            "CREATE ROW POLICY another ON mydb.filtered_table2 FOR SELECT USING 1 TO another",
-            "CREATE ROW POLICY another ON mydb.filtered_table3 FOR SELECT USING 1 TO another",
             "CREATE ROW POLICY another ON mydb.local FOR SELECT USING a = 1 TO another",
             "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default",
-            "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default",
         ]
     )
 
     expected_access = (
-        "CREATE ROW POLICY another ON mydb.filtered_table1 FOR SELECT USING 1 TO another\n"
-        "CREATE ROW POLICY another ON mydb.filtered_table2 FOR SELECT USING 1 TO another\n"
-        "CREATE ROW POLICY another ON mydb.filtered_table3 FOR SELECT USING 1 TO another\n"
         "CREATE ROW POLICY another ON mydb.local FOR SELECT USING a = 1 TO another\n"
         "CREATE ROW POLICY default ON mydb.filtered_table1 FOR SELECT USING a = 1 TO default\n"
         "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING ((a + b) < 1) OR ((c - d) > 5) TO default\n"
         "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 1 TO default\n"
-        "CREATE ROW POLICY default ON mydb.local FOR SELECT USING 1 TO default\n"
     )
     assert expected_access in node.query("SHOW ACCESS")
 
     copy_policy_xml("all_rows.xml")
     assert node.query("SHOW POLICIES") == TSV(
         [
-            "another ON mydb.filtered_table1",
-            "another ON mydb.filtered_table2",
-            "another ON mydb.filtered_table3",
             "default ON mydb.filtered_table1",
             "default ON mydb.filtered_table2",
             "default ON mydb.filtered_table3",
@@ -653,9 +572,6 @@ def test_dcl_introspection():
     copy_policy_xml("no_rows.xml")
     assert node.query("SHOW POLICIES") == TSV(
         [
-            "another ON mydb.filtered_table1",
-            "another ON mydb.filtered_table2",
-            "another ON mydb.filtered_table3",
             "default ON mydb.filtered_table1",
             "default ON mydb.filtered_table2",
             "default ON mydb.filtered_table3",
@@ -683,7 +599,9 @@ def test_dcl_management():
     assert node.query("SHOW POLICIES") == ""
 
     node.query("CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a<b")
-    assert node.query("SELECT * FROM mydb.filtered_table1") == ""
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV(
+        [[0, 0], [0, 1], [1, 0], [1, 1]]
+    )
     assert node.query("SHOW POLICIES ON mydb.filtered_table1") == "pA\n"
 
     node.query("ALTER POLICY pA ON mydb.filtered_table1 TO default")
@@ -787,6 +705,70 @@ def test_users_xml_is_readonly():
     )
 
 
+def test_dcl_users_with_policies_from_users_xml():
+    node.query("CREATE USER X")
+    node.query("GRANT SELECT ON mydb.filtered_table1 TO X")
+
+    assert node.query("SELECT * FROM mydb.filtered_table1") == TSV([[1, 0], [1, 1]])
+
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [0, 1], [1, 0], [1, 1]]
+    )
+
+    node.query("DROP USER X")
+
+
+def test_some_users_without_policies():
+    copy_policy_xml("no_filters.xml")
+    assert node.query("SHOW POLICIES") == ""
+    node.query("CREATE USER X, Y")
+    node.query("GRANT SELECT ON mydb.filtered_table1 TO X, Y")
+
+    # permissive a >= b for X, none for Y
+    node.query(
+        "CREATE POLICY pA ON mydb.filtered_table1 FOR SELECT USING a >= b AS permissive TO X"
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == TSV(
+        [[0, 0], [0, 1], [1, 0], [1, 1]]
+    )
+
+    # restrictive a >=b for X, none for Y
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 AS restrictive")
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == TSV(
+        [[0, 0], [0, 1], [1, 0], [1, 1]]
+    )
+
+    # permissive a >= b for X, restrictive a <= b for X, none for Y
+    node.query("ALTER POLICY pA ON mydb.filtered_table1 AS permissive")
+    node.query(
+        "CREATE POLICY pB ON mydb.filtered_table1 FOR SELECT USING a <= b AS restrictive TO X"
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == TSV(
+        [[0, 0], [0, 1], [1, 0], [1, 1]]
+    )
+
+    # permissive a >= b for X, restrictive a <= b for Y
+    node.query("ALTER POLICY pB ON mydb.filtered_table1 TO Y")
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="X") == TSV(
+        [[0, 0], [1, 0], [1, 1]]
+    )
+    assert node.query("SELECT * FROM mydb.filtered_table1", user="Y") == TSV(
+        [[0, 0], [0, 1], [1, 1]]
+    )
+
+    node.query("DROP POLICY pA, pB ON mydb.filtered_table1")
+    node.query("DROP USER X, Y")
+
+
 def test_tags_with_db_and_table_names():
     copy_policy_xml("tags_with_db_and_table_names.xml")
 
diff --git a/tests/integration/test_s3_cluster/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
index 404a15b1273..18f15763633 100644
--- a/tests/integration/test_s3_cluster/configs/cluster.xml
+++ b/tests/integration/test_s3_cluster/configs/cluster.xml
@@ -21,4 +21,7 @@
     </cluster_simple>
 
     </remote_servers>
+    <macros>
+        <default_cluster_macro>cluster_simple</default_cluster_macro>
+    </macros>
 </clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
index 93708acd49c..2cbb36fcf06 100644
--- a/tests/integration/test_s3_cluster/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -95,6 +95,29 @@ def test_count(started_cluster):
     assert TSV(pure_s3) == TSV(s3_distibuted)
 
 
+def test_count_macro(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    s3_macro = node.query(
+        """
+    SELECT count(*) from s3Cluster(
+        '{default_cluster_macro}', 'http://minio1:9001/root/data/{clickhouse,database}/*',
+        'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
+    )
+    # print(s3_distibuted)
+    s3_distibuted = node.query(
+        """
+    SELECT count(*) from s3Cluster(
+        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*',
+        'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
+    )
+    # print(s3_distibuted)
+
+    assert TSV(s3_macro) == TSV(s3_distibuted)
+
+
 def test_union_all(started_cluster):
     node = started_cluster.instances["s0_0_0"]
     pure_s3 = node.query(
diff --git a/tests/integration/test_settings_constraints_distributed/test.py b/tests/integration/test_settings_constraints_distributed/test.py
index 75d4732ffc4..aed522bb5d1 100644
--- a/tests/integration/test_settings_constraints_distributed/test.py
+++ b/tests/integration/test_settings_constraints_distributed/test.py
@@ -100,29 +100,29 @@ def test_select_clamps_settings():
     # Check that shards clamp passed settings.
     query = "SELECT hostName() as host, name, value FROM shard_settings WHERE name = 'max_memory_usage' OR name = 'readonly' ORDER BY host, name, value"
     assert (
-        distributed.query(query) == "node1\tmax_memory_usage\t99999999\n"
+        distributed.query(query) == "node1\tmax_memory_usage\t50000000\n"
         "node1\treadonly\t0\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
     assert (
         distributed.query(query, user="normal") == "node1\tmax_memory_usage\t80000000\n"
         "node1\treadonly\t0\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
     assert (
         distributed.query(query, user="wasteful")
         == "node1\tmax_memory_usage\t99999999\n"
         "node1\treadonly\t0\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
     assert (
         distributed.query(query, user="readonly")
-        == "node1\tmax_memory_usage\t99999999\n"
+        == "node1\tmax_memory_usage\t50000000\n"
         "node1\treadonly\t1\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
 
@@ -130,14 +130,14 @@ def test_select_clamps_settings():
         distributed.query(query, settings={"max_memory_usage": 1})
         == "node1\tmax_memory_usage\t11111111\n"
         "node1\treadonly\t0\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
     assert (
         distributed.query(query, settings={"max_memory_usage": 40000000, "readonly": 2})
         == "node1\tmax_memory_usage\t40000000\n"
         "node1\treadonly\t2\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
     assert (
@@ -146,7 +146,7 @@ def test_select_clamps_settings():
         )
         == "node1\tmax_memory_usage\t99999999\n"
         "node1\treadonly\t2\n"
-        "node2\tmax_memory_usage\t10000000000\n"
+        "node2\tmax_memory_usage\t0\n"
         "node2\treadonly\t1\n"
     )
 
diff --git a/tests/integration/test_settings_profile/test.py b/tests/integration/test_settings_profile/test.py
index b4c0cec9f48..a90273e7a7a 100644
--- a/tests/integration/test_settings_profile/test.py
+++ b/tests/integration/test_settings_profile/test.py
@@ -115,7 +115,7 @@ def test_smoke():
             "SELECT value FROM system.settings WHERE name = 'max_memory_usage'",
             user="robin",
         )
-        == "10000000000\n"
+        == "0\n"
     )
     instance.query("SET max_memory_usage = 80000000", user="robin")
     instance.query("SET max_memory_usage = 120000000", user="robin")
@@ -158,7 +158,7 @@ def test_smoke():
             "SELECT value FROM system.settings WHERE name = 'max_memory_usage'",
             user="robin",
         )
-        == "10000000000\n"
+        == "0\n"
     )
     instance.query("SET max_memory_usage = 80000000", user="robin")
     instance.query("SET max_memory_usage = 120000000", user="robin")
@@ -228,7 +228,7 @@ def test_settings_from_granted_role():
             "SELECT value FROM system.settings WHERE name = 'max_memory_usage'",
             user="robin",
         )
-        == "10000000000\n"
+        == "0\n"
     )
     instance.query("SET max_memory_usage = 120000000", user="robin")
 
@@ -240,7 +240,7 @@ def test_settings_from_granted_role():
             "SELECT value FROM system.settings WHERE name = 'max_memory_usage'",
             user="robin",
         )
-        == "10000000000\n"
+        == "0\n"
     )
     instance.query("SET max_memory_usage = 120000000", user="robin")
     assert system_settings_profile_elements(role_name="worker") == []
@@ -278,7 +278,7 @@ def test_settings_from_granted_role():
             "SELECT value FROM system.settings WHERE name = 'max_memory_usage'",
             user="robin",
         )
-        == "10000000000\n"
+        == "0\n"
     )
     instance.query("SET max_memory_usage = 120000000", user="robin")
     assert system_settings_profile("xyz") == [
@@ -360,7 +360,7 @@ def test_alter_and_drop():
             "SELECT value FROM system.settings WHERE name = 'max_memory_usage'",
             user="robin",
         )
-        == "10000000000\n"
+        == "0\n"
     )
     instance.query("SET max_memory_usage = 80000000", user="robin")
     instance.query("SET max_memory_usage = 120000000", user="robin")
@@ -374,17 +374,17 @@ def test_show_profiles():
     assert instance.query("SHOW CREATE PROFILE xyz") == "CREATE SETTINGS PROFILE xyz\n"
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE default")
-        == "CREATE SETTINGS PROFILE default SETTINGS max_memory_usage = 10000000000, load_balancing = \\'random\\'\n"
+        == "CREATE SETTINGS PROFILE default SETTINGS load_balancing = \\'random\\'\n"
     )
     assert (
         instance.query("SHOW CREATE PROFILES")
-        == "CREATE SETTINGS PROFILE default SETTINGS max_memory_usage = 10000000000, load_balancing = \\'random\\'\n"
+        == "CREATE SETTINGS PROFILE default SETTINGS load_balancing = \\'random\\'\n"
         "CREATE SETTINGS PROFILE readonly SETTINGS readonly = 1\n"
         "CREATE SETTINGS PROFILE xyz\n"
     )
 
     expected_access = (
-        "CREATE SETTINGS PROFILE default SETTINGS max_memory_usage = 10000000000, load_balancing = \\'random\\'\n"
+        "CREATE SETTINGS PROFILE default SETTINGS load_balancing = \\'random\\'\n"
         "CREATE SETTINGS PROFILE readonly SETTINGS readonly = 1\n"
         "CREATE SETTINGS PROFILE xyz\n"
     )
diff --git a/tests/integration/test_storage_hdfs/configs/macro.xml b/tests/integration/test_storage_hdfs/configs/macro.xml
new file mode 100644
index 00000000000..c2e11b47a5e
--- /dev/null
+++ b/tests/integration/test_storage_hdfs/configs/macro.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <macros>
+        <default_cluster_macro>test_cluster_two_shards</default_cluster_macro>
+    </macros>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index bd9e61a9422..0490c0c1f0d 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -2,10 +2,13 @@ import os
 
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
 from pyhdfs import HdfsClient
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance("node1", with_hdfs=True)
+node1 = cluster.add_instance(
+    "node1", main_configs=["configs/macro.xml"], with_hdfs=True
+)
 
 
 @pytest.fixture(scope="module")
@@ -589,6 +592,22 @@ def test_cluster_join(started_cluster):
     assert "AMBIGUOUS_COLUMN_NAME" not in result
 
 
+def test_cluster_macro(started_cluster):
+    with_macro = node1.query(
+        """
+        SELECT id FROM hdfsCluster('{default_cluster_macro}', 'hdfs://hdfs1:9000/test_hdfsCluster/file*', 'TSV', 'id UInt32')
+    """
+    )
+
+    no_macro = node1.query(
+        """
+        SELECT id FROM hdfsCluster('test_cluster_two_shards', 'hdfs://hdfs1:9000/test_hdfsCluster/file*', 'TSV', 'id UInt32')
+    """
+    )
+
+    assert TSV(with_macro) == TSV(no_macro)
+
+
 def test_virtual_columns_2(started_cluster):
     hdfs_api = started_cluster.hdfs_api
 
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index a27b5a134e4..166ba773e27 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -570,13 +570,12 @@ def test_kafka_formats(kafka_cluster):
                 b"\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01",
                 # ''
                 # On empty message exception happens: DB::Exception: Attempt to read after eof
-                # /src/IO/VarInt.h:122: DB::throwReadAfterEOF() @ 0x15c34487 in /usr/bin/clickhouse
-                # /src/IO/VarInt.h:135: void DB::readVarUIntImpl<false>(unsigned long&, DB::ReadBuffer&) @ 0x15c68bb7 in /usr/bin/clickhouse
-                # /src/IO/VarInt.h:149: DB::readVarUInt(unsigned long&, DB::ReadBuffer&) @ 0x15c68844 in /usr/bin/clickhouse
-                # /src/DataStreams/NativeBlockInputStream.cpp:124: DB::NativeBlockInputStream::readImpl() @ 0x1d3e2778 in /usr/bin/clickhouse
-                # /src/DataStreams/IBlockInputStream.cpp:60: DB::IBlockInputStream::read() @ 0x1c9c92fd in /usr/bin/clickhouse
-                # /src/Processors/Formats/Impl/NativeFormat.h:42: DB::NativeInputFormatFromNativeBlockInputStream::generate() @ 0x1df1ea79 in /usr/bin/clickhouse
-                # /src/Processors/ISource.cpp:48: DB::ISource::work() @ 0x1dd79737 in /usr/bin/clickhouse
+                # 1. DB::throwReadAfterEOF() @ 0xb76449b in /usr/bin/clickhouse
+                # 2. ? @ 0xb79cb0b in /usr/bin/clickhouse
+                # 3. DB::NativeReader::read() @ 0x16e7a084 in /usr/bin/clickhouse
+                # 4. DB::NativeInputFormat::generate() @ 0x16f76922 in /usr/bin/clickhouse
+                # 5. DB::ISource::tryGenerate() @ 0x16e90bd5 in /usr/bin/clickhouse
+                # 6. DB::ISource::work() @ 0x16e9087a in /usr/bin/clickhouse
             ],
         },
         "MsgPack": {
@@ -4051,7 +4050,7 @@ def test_issue26643(kafka_cluster):
             kafka_num_consumers = 4,
             kafka_skip_broken_messages = 10000;
 
-        SET allow_suspicious_low_cardinality_types=1; 
+        SET allow_suspicious_low_cardinality_types=1;
 
         CREATE TABLE test.log
         (
@@ -4095,7 +4094,7 @@ def test_issue26643(kafka_cluster):
 
     expected = """\
 2021-08-15 07:00:00	server1		443	50000	['1','2']	[0,0]	[444,0]	[123123,0]	['adsfasd','']	GET
-2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]	
+2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]
 2021-08-15 07:00:02			0	0	[]	[]	[]	[]	[]
 """
     assert TSV(result) == TSV(expected)
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index 6b54ce0a847..d8ca207d0a6 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -173,6 +173,7 @@ def test_predefined_connection_configuration(started_cluster):
     simple_mongo_table.insert_many(data)
 
     node = started_cluster.instances["node"]
+    node.query("drop table if exists simple_mongo_table")
     node.query(
         "create table simple_mongo_table(key UInt64, data String) engine = MongoDB(mongo1)"
     )
diff --git a/tests/performance/jit_sort.xml b/tests/performance/jit_sort.xml
new file mode 100644
index 00000000000..f99124a360b
--- /dev/null
+++ b/tests/performance/jit_sort.xml
@@ -0,0 +1,122 @@
+<test>
+    <preconditions>
+        <table_exists>hits_100m_single</table_exists>
+    </preconditions>
+
+    <create_query>
+        CREATE TABLE jit_test_memory (
+            key UInt64,
+            value_1 UInt64,
+            value_2 UInt64,
+            value_3 UInt64,
+            value_4 UInt64,
+            value_5 UInt64
+        ) Engine = Memory
+    </create_query>
+
+    <create_query>
+        CREATE TABLE jit_test_merge_tree (
+            key UInt64,
+            value_1 UInt64,
+            value_2 UInt64,
+            value_3 UInt64,
+            value_4 UInt64,
+            value_5 UInt64
+        ) Engine = MergeTree
+        ORDER BY key
+    </create_query>
+
+  	<create_query>
+        CREATE TABLE jit_test_memory_nullable (
+            key UInt64,
+            value_1 Nullable(UInt64),
+            value_2 Nullable(UInt64),
+            value_3 Nullable(UInt64),
+            value_4 Nullable(UInt64),
+            value_5 Nullable(UInt64)
+        ) Engine = Memory
+    </create_query>
+
+    <create_query>
+        CREATE TABLE jit_test_merge_tree_nullable (
+            key UInt64,
+            value_1 Nullable(UInt64),
+            value_2 Nullable(UInt64),
+            value_3 Nullable(UInt64),
+            value_4 Nullable(UInt64),
+            value_5 Nullable(UInt64)
+        ) Engine = MergeTree
+        ORDER BY key
+    </create_query>
+
+    <substitutions>
+        <substitution>
+            <name>table</name>
+            <values>
+                <value>jit_test_memory</value>
+                <value>jit_test_merge_tree</value>
+                <value>jit_test_memory_nullable</value>
+                <value>jit_test_merge_tree_nullable</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <fill_query>
+        INSERT INTO {table}
+        SELECT
+            number,
+            rand64(0),
+            rand64(1),
+            rand64(2),
+            rand64(3),
+            rand64(4)
+        FROM
+            system.numbers_mt
+        LIMIT 10000000
+    </fill_query>
+
+    <query>
+        SELECT
+            *
+        FROM {table}
+        ORDER BY value_1 ASC
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            *
+        FROM {table}
+        ORDER BY value_1 ASC, value_2 DESC, value_3 ASC
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            *
+        FROM {table}
+        ORDER BY value_1 ASC, value_2 DESC, value_3 ASC, value_4 DESC, value_5 ASC
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            WatchID
+        FROM hits_100m_single
+        ORDER BY WatchID ASC, CounterID DESC, ClientIP ASC
+        LIMIT 2000000
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            WatchID
+        FROM hits_100m_single
+        ORDER BY WatchID ASC, CounterID DESC, ClientIP ASC, IPNetworkID DESC, SearchEngineID ASC
+        LIMIT 2000000
+        FORMAT Null
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS {table}</drop_query>
+
+</test>
diff --git a/tests/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.sql b/tests/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.sql
index 1b7c9df2d24..1b5384a2e7d 100644
--- a/tests/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.sql
+++ b/tests/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.sql
@@ -38,7 +38,7 @@ ORDER BY k;
  * And we use function 'anyLast' for method IAggregateFunction::merge to be called for every new value.
  *
  * We use useless HAVING (that is always true), because in absense of HAVING,
- *  TOTALS are calculated in a simple way in same pass during aggregation, not in TotalsHavingBlockInputStream,
+ *  TOTALS are calculated in a simple way in same pass during aggregation, not in TotalsHavingTransform,
  *  and bug doesn't trigger.
  *
  * We use ORDER BY for result of the test to be deterministic.
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.reference b/tests/queries/0_stateless/00688_low_cardinality_serialization.reference
index aaa2efb51e6..a19bbc95e56 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.reference
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.reference
@@ -1,4 +1,4 @@
-NativeBlockInputStream
+NativeReader
 LowCardinality(String)	123_a	2	
 LowCardinality(String)	123_bb	3	123_
 LowCardinality(String)	123_	1	123_a
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
index e62d824e011..34353286118 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
@@ -1,6 +1,6 @@
 -- Tags: no-parallel
 
-select 'NativeBlockInputStream';
+select 'NativeReader';
 select toTypeName(dict), dict, lowCardinalityIndices(dict), lowCardinalityKeys(dict) from (select '123_' || toLowCardinality(v) as dict from (select arrayJoin(['a', 'bb', '', 'a', 'ccc', 'a', 'bb', '', 'dddd']) as v));
 select '-';
 select toTypeName(dict), dict, lowCardinalityIndices(dict), lowCardinalityKeys(dict) from (select '123_' || toLowCardinality(v) as dict from (select arrayJoin(['a', Null, 'bb', '', 'a', Null, 'ccc', 'a', 'bb', '', 'dddd']) as v));
diff --git a/tests/queries/0_stateless/00738_lock_for_inner_table.sh b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
index b28d1b4fa20..2f07fbacff0 100755
--- a/tests/queries/0_stateless/00738_lock_for_inner_table.sh
+++ b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
@@ -29,7 +29,7 @@ function wait_for_query_to_start()
     while [[ $(${CLICKHOUSE_CLIENT} --query "SELECT count() FROM system.processes WHERE query_id = 'insert_$CLICKHOUSE_DATABASE'") == 0 ]]; do sleep 0.001; done
 
     # The query is already started, but there is no guarantee that it locks the underlying table already.
-    # Wait until PushingToViewsBlockOutputStream will acquire the lock of the underlying table for the INSERT query.
+    # Wait until PushingToViews chain will acquire the lock of the underlying table for the INSERT query.
     # (assume that 0.5 second is enough for this, but this is not 100% correct)
     sleep 0.5
 
diff --git a/tests/queries/0_stateless/01023_materialized_view_query_context.sql b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
index 415690ae1e5..4f03a8e7e0f 100644
--- a/tests/queries/0_stateless/01023_materialized_view_query_context.sql
+++ b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
@@ -1,7 +1,7 @@
 -- Tags: no-parallel
 
 -- Create dictionary, since dictGet*() uses DB::Context in executeImpl()
--- (To cover scope of the Context in DB::PushingToViewsBlockOutputStream::process)
+-- (To cover scope of the Context in PushingToViews chain)
 
 set insert_distributed_sync=1;
 
diff --git a/tests/queries/0_stateless/01119_optimize_trivial_insert_select.reference b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.reference
new file mode 100644
index 00000000000..3bf688404f8
--- /dev/null
+++ b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.reference
@@ -0,0 +1,4 @@
+1	4999999950000000	2
+2	4999999950000000	2
+3	49999995000000	2
+4	49999995000000	2
diff --git a/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
new file mode 100644
index 00000000000..001e758284f
--- /dev/null
+++ b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
@@ -0,0 +1,15 @@
+drop table if exists t;
+create table t(n int, a Int64, s String) engine = MergeTree() order by a;
+
+set optimize_trivial_insert_select=1;
+
+-- due to aggregate functions, optimize_trivial_insert_select will not be applied
+insert into t select 1, sum(number) as c, getSetting('max_threads') from numbers_mt(100000000) settings max_insert_threads=4, max_threads=2;
+-- due to GROUP BY, optimize_trivial_insert_select will not be applied
+insert into t select 2, sum(number) as c, getSetting('max_threads') from numbers_mt(100000000) group by 1 settings max_insert_threads=4, max_threads=2;
+insert into t select 3, sum(number) as c, getSetting('max_threads') from numbers_mt(10000000) group by 3 settings max_insert_threads=4, max_threads=2;
+insert into t select 4, sum(number) as c, getSetting('max_threads') as mt from numbers_mt(10000000) group by mt settings max_insert_threads=4, max_threads=2;
+
+select n, a, s from t order by n;
+
+drop table t;
diff --git a/tests/queries/0_stateless/01166_truncate_multiple_partitions.reference b/tests/queries/0_stateless/01166_truncate_multiple_partitions.reference
new file mode 100644
index 00000000000..27f26b32e1e
--- /dev/null
+++ b/tests/queries/0_stateless/01166_truncate_multiple_partitions.reference
@@ -0,0 +1,8 @@
+20	190
+0	0
+8	52
+0	0
+20	190
+0	0
+8	52
+0	0
diff --git a/tests/queries/0_stateless/01166_truncate_multiple_partitions.sql b/tests/queries/0_stateless/01166_truncate_multiple_partitions.sql
new file mode 100644
index 00000000000..1a7e3ed3bc4
--- /dev/null
+++ b/tests/queries/0_stateless/01166_truncate_multiple_partitions.sql
@@ -0,0 +1,31 @@
+drop table if exists trunc;
+
+set default_table_engine='ReplicatedMergeTree';
+create table trunc (n int, primary key n) engine=ReplicatedMergeTree('/test/1166/{database}', '1') partition by n % 10;
+insert into trunc select * from numbers(20);
+select count(), sum(n) from trunc;
+alter table trunc detach partition all;
+select count(), sum(n) from trunc;
+alter table trunc attach partition id '0';
+alter table trunc attach partition id '1';
+alter table trunc attach partition id '2';
+alter table trunc attach partition id '3';
+select count(), sum(n) from trunc;
+truncate trunc;
+select count(), sum(n) from trunc;
+drop table trunc;
+
+set default_table_engine='MergeTree';
+create table trunc (n int, primary key n) partition by n % 10;
+insert into trunc select * from numbers(20);
+select count(), sum(n) from trunc;
+alter table trunc detach partition all;
+select count(), sum(n) from trunc;
+alter table trunc attach partition id '0';
+alter table trunc attach partition id '1';
+alter table trunc attach partition id '2';
+alter table trunc attach partition id '3';
+select count(), sum(n) from trunc;
+truncate trunc;
+select count(), sum(n) from trunc;
+drop table trunc;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01268_procfs_metrics.sh b/tests/queries/0_stateless/01268_procfs_metrics.sh
index 959d922d801..4f09d197596 100755
--- a/tests/queries/0_stateless/01268_procfs_metrics.sh
+++ b/tests/queries/0_stateless/01268_procfs_metrics.sh
@@ -17,5 +17,5 @@ truncate -s1025 "$tmp_path"
 
 $CLICKHOUSE_LOCAL --profile-events-delay-ms=-1 --print-profile-events -q "SELECT * FROM file('$tmp_path', 'LineAsString') FORMAT Null" |& grep -m1 -F -o -e OSReadChars
 # NOTE: that OSCPUVirtualTimeMicroseconds is in microseconds, so 1e6 is not enough.
-$CLICKHOUSE_LOCAL --profile-events-delay-ms=-1 --print-profile-events -q "SELECT * FROM numbers(10e6) FORMAT Null" |& grep -m1 -F -o -e OSCPUVirtualTimeMicroseconds
+$CLICKHOUSE_LOCAL --profile-events-delay-ms=-1 --print-profile-events -q "SELECT * FROM numbers(1e8) FORMAT Null" |& grep -m1 -F -o -e OSCPUVirtualTimeMicroseconds
 exit 0
diff --git a/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql b/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
index 59d8605ba1c..58522942641 100644
--- a/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
+++ b/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
@@ -13,7 +13,6 @@ SET log_queries=0;
 SYSTEM FLUSH LOGS;
 
 -- 1 for PullingAsyncPipelineExecutor::pull
--- 1 for AsynchronousBlockInputStream
 SELECT
     throwIf(count() != 1, 'no query was logged'),
     throwIf(length(thread_ids) != 2, 'too many threads used')
diff --git a/tests/queries/0_stateless/01293_show_clusters.sql b/tests/queries/0_stateless/01293_show_clusters.sql
index ad5e51531e3..e1ef8621a16 100644
--- a/tests/queries/0_stateless/01293_show_clusters.sql
+++ b/tests/queries/0_stateless/01293_show_clusters.sql
@@ -1,3 +1,4 @@
 -- don't show all clusters to reduce dependency on the configuration of server
+set send_logs_level = 'fatal';
 show clusters like 'test_shard%' limit 1;
 show cluster 'test_shard_localhost';
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index 75e0ec5ffec..f7ac5457f4a 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -3,6 +3,5 @@ connect_timeout	Seconds	10
 connect_timeout_with_failover_ms	Milliseconds	2000
 connect_timeout_with_failover_secure_ms	Milliseconds	3000
 external_storage_connect_timeout_sec	UInt64	10
-max_memory_usage	UInt64	10000000000
 max_untracked_memory	UInt64	1048576
 memory_profiler_step	UInt64	1048576
diff --git a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
index be1d9897053..9f78a1f95e1 100644
--- a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
+++ b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
@@ -23,6 +23,7 @@ WITH (
       ) AS t)
 SELECT if(dateDiff('second', toDateTime(time_with_microseconds), toDateTime(t)) = 0, 'ok', 'fail'); --
 
+SET log_query_threads = 1;
 SELECT '01461_query_thread_log_query_start_time_milliseconds_test';
 SYSTEM FLUSH LOGS;
 -- assumes that the query_start_time field is already accurate.
diff --git a/tests/queries/0_stateless/01473_event_time_microseconds.sql b/tests/queries/0_stateless/01473_event_time_microseconds.sql
index 932acf48cc4..2b443cf82eb 100644
--- a/tests/queries/0_stateless/01473_event_time_microseconds.sql
+++ b/tests/queries/0_stateless/01473_event_time_microseconds.sql
@@ -6,6 +6,7 @@
 -- Refer: tests/integration/test_asynchronous_metric_log_table.
 
 SET log_queries = 1;
+SET log_query_threads = 1;
 SET query_profiler_real_time_period_ns = 100000000;
 -- a long enough query to trigger the query profiler and to record trace log
 SELECT sleep(2) FORMAT Null;
diff --git a/tests/queries/0_stateless/01586_columns_pruning.sql b/tests/queries/0_stateless/01586_columns_pruning.sql
index 4ae6b6c7c10..598e64b9fe4 100644
--- a/tests/queries/0_stateless/01586_columns_pruning.sql
+++ b/tests/queries/0_stateless/01586_columns_pruning.sql
@@ -1,3 +1,5 @@
+SET max_memory_usage = 10000000000;
+
 -- Unneeded column is removed from subquery.
 SELECT count() FROM (SELECT number, groupArray(repeat(toString(number), 1000000)) FROM numbers(1000000) GROUP BY number);
 -- Unneeded column cannot be removed from subquery and the query is out of memory
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
index 9f376fb3e4f..f3be69d3279 100644
--- a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
@@ -1,5 +1,5 @@
-<Warning> DistributedBlockOutputStream: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
-<Warning> DistributedBlockOutputStream: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
+<Warning> DistributedSink: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
+<Warning> DistributedSink: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
 <Warning> default.dist_01683.DirectoryMonitor: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 0)), implicit conversion will be done
 <Warning> default.dist_01683.DirectoryMonitor: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 0)), implicit conversion will be done
 1
diff --git a/tests/queries/0_stateless/01883_grouping_sets_crash.reference b/tests/queries/0_stateless/01883_grouping_sets_crash.reference
new file mode 100644
index 00000000000..4d9e967b766
--- /dev/null
+++ b/tests/queries/0_stateless/01883_grouping_sets_crash.reference
@@ -0,0 +1,209 @@
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+SECOND QUERY:
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+THIRD QUERY:
+\N	1	0	0
+\N	2	0	0
+\N	3	0	0
+\N	4	0	0
+\N	5	0	0
+\N	1	0	0
+\N	2	0	0
+\N	3	0	0
+\N	4	0	0
+\N	5	0	0
+\N	0	10	10
+\N	0	9	9
+\N	0	8	8
+\N	0	7	7
+\N	0	6	6
+\N	0	5	5
+\N	0	4	4
+\N	0	3	3
+\N	0	2	2
+\N	0	1	1
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+\N	0	0	0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+w\0\0ldworldwo\0l\0world
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
diff --git a/tests/queries/0_stateless/01883_grouping_sets_crash.sql b/tests/queries/0_stateless/01883_grouping_sets_crash.sql
new file mode 100644
index 00000000000..cf56c8546ce
--- /dev/null
+++ b/tests/queries/0_stateless/01883_grouping_sets_crash.sql
@@ -0,0 +1,99 @@
+DROP TABLE IF EXISTS grouping_sets;
+
+CREATE TABLE grouping_sets(fact_1_id Int32, fact_2_id Int32, fact_3_id Int32, fact_4_id Int32, sales_value Int32) ENGINE = Memory;
+
+INSERT INTO grouping_sets
+SELECT
+    number % 2 + 1 AS fact_1_id,
+       number % 5 + 1 AS fact_2_id,
+       number % 10 + 1 AS fact_3_id,
+       number % 10 + 1 AS fact_4_id,
+       number % 100 AS sales_value
+FROM system.numbers limit 1000;
+
+SELECT
+    fact_3_id,
+    fact_4_id
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+        ('wo\0ldworldwo\0ldworld'),
+        (fact_3_id, fact_4_id))
+ORDER BY
+    fact_3_id, fact_4_id;
+
+SELECT 'SECOND QUERY:';
+
+SELECT
+    fact_3_id,
+    fact_4_id
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    (fact_1_id, fact_2_id),
+    ((-9223372036854775808, NULL, (tuple(1.), (tuple(1.), 1048576), 65535))),
+    ((tuple(3.4028234663852886e38), (tuple(1024), -2147483647), NULL)),
+    (fact_3_id, fact_4_id))
+ORDER BY
+    (NULL, ('256', (tuple(NULL), NULL), NULL, NULL), NULL) ASC,
+    fact_1_id DESC NULLS FIRST,
+    fact_2_id DESC NULLS FIRST,
+    fact_4_id ASC;
+
+SELECT 'THIRD QUERY:';
+
+SELECT
+    extractAllGroups(NULL, 'worldworldworldwo\0ldworldworldworldwo\0ld'),
+    fact_2_id,
+    fact_3_id,
+    fact_4_id
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+        (sales_value),
+        (fact_1_id, fact_2_id),
+        ('wo\0ldworldwo\0ldworld'),
+        (fact_3_id, fact_4_id))
+ORDER BY
+    fact_1_id DESC NULLS LAST,
+    fact_1_id DESC NULLS FIRST,
+    fact_2_id ASC,
+    fact_3_id DESC NULLS FIRST,
+    fact_4_id ASC;
+
+SELECT fact_3_id
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS ((fact_3_id, fact_4_id))
+ORDER BY fact_3_id ASC;
+
+-- Following two queries were fuzzed
+SELECT 'w\0\0ldworldwo\0l\0world'
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    ( fact_4_id),
+    ( NULL),
+    ( fact_3_id, fact_4_id))
+ORDER BY
+    NULL ASC,
+    NULL DESC NULLS FIRST,
+    fact_3_id ASC,
+    fact_3_id ASC NULLS LAST,
+    'wo\0ldworldwo\0ldworld' ASC NULLS LAST,
+    'w\0\0ldworldwo\0l\0world' DESC NULLS FIRST,
+    'wo\0ldworldwo\0ldworld' ASC,
+    NULL ASC NULLS FIRST,
+    fact_4_id DESC NULLS LAST;
+
+SELECT fact_3_id
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    ( 'wo\0ldworldwo\0ldworldwo\0ldworldwo\0ldworldwo\0ldworldwo\0ldworldwo\0ldworldwo\0ldworld'),
+    ( NULL),
+    ( fact_4_id),
+    ( fact_3_id, fact_4_id))
+ORDER BY fact_3_id ASC NULLS FIRST;
+
+DROP TABLE IF EXISTS grouping_sets;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01883_with_grouping_sets.reference b/tests/queries/0_stateless/01883_with_grouping_sets.reference
new file mode 100644
index 00000000000..a036ccb0796
--- /dev/null
+++ b/tests/queries/0_stateless/01883_with_grouping_sets.reference
@@ -0,0 +1,208 @@
+(Expression)
+ExpressionTransform
+  (Sorting)
+  MergingSortedTransform 2 → 1
+    MergeSortingTransform × 2
+      LimitsCheckingTransform × 2
+        PartialSortingTransform × 2
+          (Expression)
+          ExpressionTransform × 2
+            (Aggregating)
+            ExpressionTransform × 2
+              AggregatingTransform × 2
+                Copy 1 → 2
+                  (Expression)
+                  ExpressionTransform
+                    (SettingQuotaAndLimits)
+                      (ReadFromStorage)
+                      Memory 0 → 1
+1	0	1	4500
+1	0	3	4700
+1	0	5	4900
+1	0	7	5100
+1	0	9	5300
+1	1	0	4500
+1	2	0	5100
+1	3	0	4700
+1	4	0	5300
+1	5	0	4900
+2	0	2	4600
+2	0	4	4800
+2	0	6	5000
+2	0	8	5200
+2	0	10	5400
+2	1	0	5000
+2	2	0	4600
+2	3	0	5200
+2	4	0	4800
+2	5	0	5400
+0	0	1	1	4500
+0	0	2	2	4600
+0	0	3	3	4700
+0	0	4	4	4800
+0	0	5	5	4900
+0	0	6	6	5000
+0	0	7	7	5100
+0	0	8	8	5200
+0	0	9	9	5300
+0	0	10	10	5400
+1	1	0	0	4500
+1	2	0	0	5100
+1	3	0	0	4700
+1	4	0	0	5300
+1	5	0	0	4900
+2	1	0	0	5000
+2	2	0	0	4600
+2	3	0	0	5200
+2	4	0	0	4800
+2	5	0	0	5400
+0	0	0	49500
+0	0	1	4500
+0	0	2	4600
+0	0	3	4700
+0	0	4	4800
+0	0	5	4900
+0	0	6	5000
+0	0	7	5100
+0	0	8	5200
+0	0	9	5300
+0	0	10	5400
+1	1	0	4500
+1	2	0	5100
+1	3	0	4700
+1	4	0	5300
+1	5	0	4900
+2	1	0	5000
+2	2	0	4600
+2	3	0	5200
+2	4	0	4800
+2	5	0	5400
+(Expression)
+ExpressionTransform
+  (Sorting)
+  MergingSortedTransform 2 → 1
+    MergeSortingTransform × 2
+      LimitsCheckingTransform × 2
+        PartialSortingTransform × 2
+          (Expression)
+          ExpressionTransform × 2
+            (Aggregating)
+            ExpressionTransform × 2
+              Resize × 2 3 → 1
+                AggregatingTransform × 6
+                  Copy × 3 1 → 2
+                    (Expression)
+                    ExpressionTransform × 3
+                      (SettingQuotaAndLimits)
+                        (ReadFromStorage)
+                        NumbersMt × 3 0 → 1
+4999500000	10000
+4999510000	10000
+4999520000	10000
+4999530000	10000
+4999540000	10000
+4999550000	10000
+4999560000	10000
+4999570000	10000
+4999580000	10000
+4999590000	10000
+4999600000	10000
+4999610000	10000
+4999620000	10000
+4999630000	10000
+4999640000	10000
+4999650000	10000
+4999660000	10000
+4999670000	10000
+4999680000	10000
+4999690000	10000
+4999700000	10000
+4999710000	10000
+4999720000	10000
+4999730000	10000
+4999740000	10000
+4999750000	10000
+4999760000	10000
+4999770000	10000
+4999780000	10000
+4999790000	10000
+4999800000	10000
+4999810000	10000
+4999820000	10000
+4999830000	10000
+4999840000	10000
+4999850000	10000
+4999860000	10000
+4999870000	10000
+4999880000	10000
+4999890000	10000
+4999900000	10000
+4999910000	10000
+4999920000	10000
+4999930000	10000
+4999940000	10000
+4999950000	10000
+4999960000	10000
+4999970000	10000
+4999980000	10000
+4999990000	10000
+5000000000	10000
+5000010000	10000
+5000020000	10000
+5000030000	10000
+5000040000	10000
+5000050000	10000
+5000060000	10000
+5000070000	10000
+5000080000	10000
+5000090000	10000
+5000100000	10000
+5000110000	10000
+5000120000	10000
+5000130000	10000
+5000140000	10000
+5000150000	10000
+5000160000	10000
+5000170000	10000
+5000180000	10000
+5000190000	10000
+5000200000	10000
+5000210000	10000
+5000220000	10000
+5000230000	10000
+5000240000	10000
+5000250000	10000
+5000260000	10000
+5000270000	10000
+5000280000	10000
+5000290000	10000
+5000300000	10000
+5000310000	10000
+5000320000	10000
+5000330000	10000
+5000340000	10000
+5000350000	10000
+5000360000	10000
+5000370000	10000
+5000380000	10000
+5000390000	10000
+5000400000	10000
+5000410000	10000
+5000420000	10000
+5000430000	10000
+5000440000	10000
+5000450000	10000
+5000460000	10000
+5000470000	10000
+5000480000	10000
+5000490000	10000
+49999500000	100000
+49999600000	100000
+49999700000	100000
+49999800000	100000
+49999900000	100000
+50000000000	100000
+50000100000	100000
+50000200000	100000
+50000300000	100000
+50000400000	100000
diff --git a/tests/queries/0_stateless/01883_with_grouping_sets.sql b/tests/queries/0_stateless/01883_with_grouping_sets.sql
new file mode 100644
index 00000000000..bf96248e10e
--- /dev/null
+++ b/tests/queries/0_stateless/01883_with_grouping_sets.sql
@@ -0,0 +1,58 @@
+DROP TABLE IF EXISTS grouping_sets;
+
+CREATE TABLE grouping_sets(fact_1_id Int32, fact_2_id Int32, fact_3_id Int32, fact_4_id Int32, sales_value Int32) ENGINE = Memory;
+
+SELECT fact_1_id, fact_3_id, sum(sales_value), count() from grouping_sets GROUP BY GROUPING SETS(fact_1_id, fact_3_id) ORDER BY fact_1_id, fact_3_id;
+
+INSERT INTO grouping_sets
+SELECT
+    number % 2 + 1 AS fact_1_id,
+       number % 5 + 1 AS fact_2_id,
+       number % 10 + 1 AS fact_3_id,
+       number % 10 + 1 AS fact_4_id,
+       number % 100 AS sales_value
+FROM system.numbers limit 1000;
+
+EXPLAIN PIPELINE
+SELECT fact_1_id, fact_2_id, fact_3_id, SUM(sales_value) AS sales_value from grouping_sets
+GROUP BY GROUPING SETS ((fact_1_id, fact_2_id), (fact_1_id, fact_3_id))
+ORDER BY fact_1_id, fact_2_id, fact_3_id;
+
+SELECT fact_1_id, fact_2_id, fact_3_id, SUM(sales_value) AS sales_value from grouping_sets
+GROUP BY GROUPING SETS ((fact_1_id, fact_2_id), (fact_1_id, fact_3_id))
+ORDER BY fact_1_id, fact_2_id, fact_3_id;
+
+SELECT fact_1_id, fact_2_id, fact_3_id, fact_4_id, SUM(sales_value) AS sales_value from grouping_sets
+GROUP BY GROUPING SETS ((fact_1_id, fact_2_id), (fact_3_id, fact_4_id))
+ORDER BY fact_1_id, fact_2_id, fact_3_id, fact_4_id;
+
+SELECT fact_1_id, fact_2_id, fact_3_id, SUM(sales_value) AS sales_value from grouping_sets
+GROUP BY GROUPING SETS ((fact_1_id, fact_2_id), (fact_3_id), ())
+ORDER BY fact_1_id, fact_2_id, fact_3_id;
+
+SELECT
+    fact_1_id,
+    fact_3_id,
+    SUM(sales_value) AS sales_value
+FROM grouping_sets
+GROUP BY grouping sets ((fact_1_id), (fact_1_id, fact_3_id)) WITH TOTALS
+ORDER BY fact_1_id, fact_3_id; -- { serverError NOT_IMPLEMENTED }
+
+SELECT
+    fact_1_id,
+    fact_3_id,
+    SUM(sales_value) AS sales_value
+FROM grouping_sets
+GROUP BY grouping sets (fact_1_id, (fact_1_id, fact_3_id)) WITH TOTALS
+ORDER BY fact_1_id, fact_3_id; -- { serverError NOT_IMPLEMENTED }
+
+DROP TABLE grouping_sets;
+
+EXPLAIN PIPELINE
+SELECT SUM(number) as sum_value, count() AS count_value from numbers_mt(1000000)
+GROUP BY GROUPING SETS ((number % 10), (number % 100))
+ORDER BY sum_value, count_value SETTINGS max_threads=3;
+
+SELECT SUM(number) as sum_value, count() AS count_value from numbers_mt(1000000)
+GROUP BY GROUPING SETS ((number % 10), (number % 100))
+ORDER BY sum_value, count_value SETTINGS max_threads=3;
diff --git a/tests/queries/0_stateless/02131_multiply_row_policies_on_same_column.reference b/tests/queries/0_stateless/02131_multiply_row_policies_on_same_column.reference
deleted file mode 100644
index 3f71510f3a5..00000000000
--- a/tests/queries/0_stateless/02131_multiply_row_policies_on_same_column.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-4
-1
-2
-3
-3
-3
-3
-4
diff --git a/tests/queries/0_stateless/02131_multiply_row_policies_on_same_column.sql b/tests/queries/0_stateless/02131_multiply_row_policies_on_same_column.sql
deleted file mode 100644
index d0a55c6ba65..00000000000
--- a/tests/queries/0_stateless/02131_multiply_row_policies_on_same_column.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-SET optimize_move_to_prewhere = 1;
-
-DROP TABLE IF EXISTS 02131_multiply_row_policies_on_same_column;
-CREATE TABLE 02131_multiply_row_policies_on_same_column (x UInt8) ENGINE = MergeTree ORDER BY x;
-INSERT INTO 02131_multiply_row_policies_on_same_column VALUES (1), (2), (3), (4);
-
-
-DROP ROW POLICY IF EXISTS 02131_filter_1 ON 02131_multiply_row_policies_on_same_column;
-DROP ROW POLICY IF EXISTS 02131_filter_2 ON 02131_multiply_row_policies_on_same_column;
-DROP ROW POLICY IF EXISTS 02131_filter_3 ON 02131_multiply_row_policies_on_same_column;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-
-
-CREATE ROW POLICY 02131_filter_1 ON 02131_multiply_row_policies_on_same_column USING x=1 TO ALL;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-CREATE ROW POLICY 02131_filter_2 ON 02131_multiply_row_policies_on_same_column USING x=2 TO ALL;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-CREATE ROW POLICY 02131_filter_3 ON 02131_multiply_row_policies_on_same_column USING x=3 TO ALL;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-
-
-CREATE ROW POLICY 02131_filter_4 ON 02131_multiply_row_policies_on_same_column USING x<4 AS RESTRICTIVE TO ALL;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-
-DROP ROW POLICY 02131_filter_1 ON 02131_multiply_row_policies_on_same_column;
-DROP ROW POLICY 02131_filter_2 ON 02131_multiply_row_policies_on_same_column;
-DROP ROW POLICY 02131_filter_3 ON 02131_multiply_row_policies_on_same_column;
-DROP ROW POLICY 02131_filter_4 ON 02131_multiply_row_policies_on_same_column;
-SELECT count() FROM 02131_multiply_row_policies_on_same_column;
-DROP TABLE 02131_multiply_row_policies_on_same_column;
diff --git a/tests/queries/0_stateless/02131_row_policies_combination.reference b/tests/queries/0_stateless/02131_row_policies_combination.reference
new file mode 100644
index 00000000000..b76028d5077
--- /dev/null
+++ b/tests/queries/0_stateless/02131_row_policies_combination.reference
@@ -0,0 +1,33 @@
+None
+1
+2
+3
+4
+R1: x == 1
+1
+R1, R2: (x == 1) OR (x == 2)
+1
+2
+R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)
+1
+2
+3
+R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)
+1
+2
+R1, R2, R3, R4, R5: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2) AND (x >= 2)
+2
+R2, R3, R4, R5: ((x == 2) OR (x == 3)) AND (x <= 2) AND (x >= 2)
+2
+R3, R4, R5: (x == 3) AND (x <= 2) AND (x >= 2)
+R4, R5: (x <= 2) AND (x >= 2)
+2
+R5: (x >= 2)
+2
+3
+4
+None
+1
+2
+3
+4
diff --git a/tests/queries/0_stateless/02131_row_policies_combination.sql b/tests/queries/0_stateless/02131_row_policies_combination.sql
new file mode 100644
index 00000000000..b5be672bb1b
--- /dev/null
+++ b/tests/queries/0_stateless/02131_row_policies_combination.sql
@@ -0,0 +1,54 @@
+DROP TABLE IF EXISTS 02131_rptable;
+CREATE TABLE 02131_rptable (x UInt8) ENGINE = MergeTree ORDER BY x;
+INSERT INTO 02131_rptable VALUES (1), (2), (3), (4);
+
+DROP ROW POLICY IF EXISTS 02131_filter_1 ON 02131_rptable;
+DROP ROW POLICY IF EXISTS 02131_filter_2 ON 02131_rptable;
+DROP ROW POLICY IF EXISTS 02131_filter_3 ON 02131_rptable;
+DROP ROW POLICY IF EXISTS 02131_filter_4 ON 02131_rptable;
+DROP ROW POLICY IF EXISTS 02131_filter_5 ON 02131_rptable;
+
+SELECT 'None';
+SELECT * FROM 02131_rptable;
+
+CREATE ROW POLICY 02131_filter_1 ON 02131_rptable USING x=1 AS permissive TO ALL;
+SELECT 'R1: x == 1';
+SELECT * FROM 02131_rptable;
+
+CREATE ROW POLICY 02131_filter_2 ON 02131_rptable USING x=2 AS permissive TO ALL;
+SELECT 'R1, R2: (x == 1) OR (x == 2)';
+SELECT * FROM 02131_rptable;
+
+CREATE ROW POLICY 02131_filter_3 ON 02131_rptable USING x=3 AS permissive TO ALL;
+SELECT 'R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)';
+SELECT * FROM 02131_rptable;
+
+CREATE ROW POLICY 02131_filter_4 ON 02131_rptable USING x<=2 AS restrictive TO ALL;
+SELECT 'R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)';
+SELECT * FROM 02131_rptable;
+
+CREATE ROW POLICY 02131_filter_5 ON 02131_rptable USING x>=2 AS restrictive TO ALL;
+SELECT 'R1, R2, R3, R4, R5: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2) AND (x >= 2)';
+SELECT * FROM 02131_rptable;
+
+DROP ROW POLICY 02131_filter_1 ON 02131_rptable;
+SELECT 'R2, R3, R4, R5: ((x == 2) OR (x == 3)) AND (x <= 2) AND (x >= 2)';
+SELECT * FROM 02131_rptable;
+
+DROP ROW POLICY 02131_filter_2 ON 02131_rptable;
+SELECT 'R3, R4, R5: (x == 3) AND (x <= 2) AND (x >= 2)';
+SELECT * FROM 02131_rptable;
+
+DROP ROW POLICY 02131_filter_3 ON 02131_rptable;
+SELECT 'R4, R5: (x <= 2) AND (x >= 2)';
+SELECT * FROM 02131_rptable;
+
+DROP ROW POLICY 02131_filter_4 ON 02131_rptable;
+SELECT 'R5: (x >= 2)';
+SELECT * FROM 02131_rptable;
+
+DROP ROW POLICY 02131_filter_5 ON 02131_rptable;
+SELECT 'None';
+SELECT * FROM 02131_rptable;
+
+DROP TABLE 02131_rptable;
diff --git a/tests/queries/0_stateless/02165_replicated_grouping_sets.reference b/tests/queries/0_stateless/02165_replicated_grouping_sets.reference
new file mode 100644
index 00000000000..659cd98368d
--- /dev/null
+++ b/tests/queries/0_stateless/02165_replicated_grouping_sets.reference
@@ -0,0 +1,13 @@
+0	0	3	2
+0	1	5	2
+0	0	6	3
+0	2	7	2
+1	0	9	3
+0	0	6	4
+0	1	10	4
+0	0	12	6
+0	2	14	4
+1	0	18	6
+0	6	4
+1	10	4
+2	14	4
diff --git a/tests/queries/0_stateless/02165_replicated_grouping_sets.sql b/tests/queries/0_stateless/02165_replicated_grouping_sets.sql
new file mode 100644
index 00000000000..d92d92c3e72
--- /dev/null
+++ b/tests/queries/0_stateless/02165_replicated_grouping_sets.sql
@@ -0,0 +1,45 @@
+SELECT
+    k1,
+    k2,
+    SUM(number) AS sum_value,
+    count() AS count_value
+FROM numbers(6)
+GROUP BY
+    GROUPING SETS
+    (
+        (number % 2 AS k1),
+        (number % 3 AS k2)
+    )
+ORDER BY
+    sum_value ASC,
+    count_value ASC;
+
+SELECT
+    k1,
+    k2,
+    SUM(number) AS sum_value,
+    count() AS count_value
+FROM remote('127.0.0.{2,3}', numbers(6))
+GROUP BY
+    GROUPING SETS
+    (
+        (number % 2 AS k1),
+        (number % 3 AS k2)
+    )
+ORDER BY
+    sum_value ASC,
+    count_value ASC;
+
+SELECT
+    k2,
+    SUM(number) AS sum_value,
+    count() AS count_value
+FROM remote('127.0.0.{2,3}', numbers(6))
+GROUP BY
+    GROUPING SETS
+    (
+        (number % 3 AS k2)
+    )
+ORDER BY
+    sum_value ASC,
+    count_value ASC;
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.reference b/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.reference
index 9b0d13a1625..0a797d38d7e 100644
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.reference
+++ b/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.reference
@@ -7,12 +7,11 @@ DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS system.filesystem_cache_log;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100000);
-SELECT  * FROM test FORMAT Null;
+SELECT 2240, * FROM test FORMAT Null;
 SYSTEM FLUSH LOGS;
-SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_FS_AND_DOWNLOADED_TO_CACHE';
-(0,519)	READ_FROM_FS_AND_DOWNLOADED_TO_CACHE
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_FS_AND_DOWNLOADED_TO_CACHE' AND query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2240%' AND current_database = currentDatabase() ORDER BY event_time desc LIMIT 1);
 (0,808110)	READ_FROM_FS_AND_DOWNLOADED_TO_CACHE
-SELECT  * FROM test FORMAT Null;
+SELECT 2241, * FROM test FORMAT Null;
 SYSTEM FLUSH LOGS;
-SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_CACHE';
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_CACHE' AND query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2241%' AND current_database = currentDatabase() ORDER BY event_time desc LIMIT 1);
 (0,808110)	READ_FROM_CACHE
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql b/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql
index 59e164d6f9f..871f9305c55 100644
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql
+++ b/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql
@@ -11,10 +11,10 @@ DROP TABLE IF EXISTS system.filesystem_cache_log;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100000);
 
-SELECT  * FROM test FORMAT Null;
+SELECT 2240, * FROM test FORMAT Null;
 SYSTEM FLUSH LOGS;
-SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_FS_AND_DOWNLOADED_TO_CACHE';
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_FS_AND_DOWNLOADED_TO_CACHE' AND query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2240%' AND current_database = currentDatabase() ORDER BY event_time desc LIMIT 1);
 
-SELECT  * FROM test FORMAT Null;
+SELECT 2241, * FROM test FORMAT Null;
 SYSTEM FLUSH LOGS;
-SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_CACHE';
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_CACHE' AND query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2241%' AND current_database = currentDatabase() ORDER BY event_time desc LIMIT 1);
diff --git a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference
index 47e37dc8fc8..c075b08e533 100644
--- a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference
+++ b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.reference
@@ -1,2 +1,14 @@
 2	1	2
+0	1	0
+0	1	1	0
+0	1	0
+0	0	1	0
+y	0	0	1	3
+\N	0	\N	10000000000	\N
 2	1	2
+0	1	0
+0	1	1	0
+0	1	0
+0	0	1	0
+y	0	0	1	3
+\N	0	\N	10000000000	\N
diff --git a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
index 118d475207a..b51b3cc22e2 100644
--- a/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
+++ b/tests/queries/0_stateless/02267_join_dup_columns_issue36199.sql
@@ -1,13 +1,22 @@
-set join_algorithm = 'hash';
+SET join_algorithm = 'hash';
 
-SELECT *
-FROM ( SELECT 2 AS x ) AS t1
-RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2
-ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) AS t1 RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y') :: Nullable(Int32), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT count('a'), count('b'), count('c'), 2 AS x ) as t1 RIGHT JOIN ( SELECT  count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
 
-set join_algorithm = 'partial_merge';
+SELECT 'y', * FROM (SELECT count('y'), count('y'), 2 AS x) AS t1 RIGHT JOIN (SELECT count('x'), count('y'), 3 AS x) AS t2 ON t1.x = t2.x;
+SELECT * FROM (SELECT arrayJoin([NULL]), 9223372036854775806, arrayJoin([NULL]), NULL AS x) AS t1 RIGHT JOIN (SELECT arrayJoin([arrayJoin([10000000000.])]), NULL AS x) AS t2 ON t1.x = t2.x;
 
-SELECT *
-FROM ( SELECT 2 AS x ) AS t1
-RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2
-ON t1.x = t2.x;
+SET join_algorithm = 'partial_merge';
+
+SELECT * FROM ( SELECT 2 AS x ) AS t1 RIGHT JOIN ( SELECT count('x'), count('y'), 2 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+SELECT * FROM ( SELECT 2 AS x ) as t1 RIGHT JOIN ( SELECT count('x') :: Nullable(Int32), count('y') :: Nullable(Int32), 0 AS x ) AS t2 ON t1.x = t2.x;
+
+SELECT * FROM ( SELECT count('a'), count('b'), count('c'), 2 AS x ) as t1 RIGHT JOIN ( SELECT  count('x'), count('y'), 0 AS x ) AS t2 ON t1.x = t2.x;
+
+SELECT 'y', * FROM (SELECT count('y'), count('y'), 2 AS x) AS t1 RIGHT JOIN (SELECT count('x'), count('y'), 3 AS x) AS t2 ON t1.x = t2.x;
+SELECT * FROM (SELECT arrayJoin([NULL]), 9223372036854775806, arrayJoin([NULL]), NULL AS x) AS t1 RIGHT JOIN (SELECT arrayJoin([arrayJoin([10000000000.])]), NULL AS x) AS t2 ON t1.x = t2.x;
diff --git a/tests/queries/0_stateless/02286_function_wyhash.reference b/tests/queries/0_stateless/02286_function_wyhash.reference
new file mode 100644
index 00000000000..6b861deb81e
--- /dev/null
+++ b/tests/queries/0_stateless/02286_function_wyhash.reference
@@ -0,0 +1,4 @@
+\N
+4808886099364463827
+10557035923789874751
+10561902096955922022
diff --git a/tests/queries/0_stateless/02286_function_wyhash.sql b/tests/queries/0_stateless/02286_function_wyhash.sql
new file mode 100644
index 00000000000..3307821b465
--- /dev/null
+++ b/tests/queries/0_stateless/02286_function_wyhash.sql
@@ -0,0 +1,5 @@
+SELECT wyHash64(NULL);
+SELECT wyHash64('');
+SELECT wyHash64(' ');
+SELECT wyHash64('qwerty');
+
diff --git a/tests/queries/0_stateless/02293_arrow_dictionary_indexes.reference b/tests/queries/0_stateless/02293_arrow_dictionary_indexes.reference
new file mode 100644
index 00000000000..9ece9606f8b
--- /dev/null
+++ b/tests/queries/0_stateless/02293_arrow_dictionary_indexes.reference
@@ -0,0 +1,300 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
diff --git a/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql b/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql
new file mode 100644
index 00000000000..3ff6a5ffbb3
--- /dev/null
+++ b/tests/queries/0_stateless/02293_arrow_dictionary_indexes.sql
@@ -0,0 +1,3 @@
+-- Tags: no-fasttest
+insert into function file(02293_data.arrow) select toLowCardinality(toString(number)) from numbers(300) settings output_format_arrow_low_cardinality_as_dictionary=1, engine_file_truncate_on_insert=1;
+select * from file(02293_data.arrow);
diff --git a/tests/queries/0_stateless/02293_ilike_on_fixed_strings.reference b/tests/queries/0_stateless/02293_ilike_on_fixed_strings.reference
new file mode 100644
index 00000000000..5489ab3d7ce
--- /dev/null
+++ b/tests/queries/0_stateless/02293_ilike_on_fixed_strings.reference
@@ -0,0 +1,2 @@
+AA	0	1
+Aa	1	1
diff --git a/tests/queries/0_stateless/02293_ilike_on_fixed_strings.sql b/tests/queries/0_stateless/02293_ilike_on_fixed_strings.sql
new file mode 100644
index 00000000000..3838e372e24
--- /dev/null
+++ b/tests/queries/0_stateless/02293_ilike_on_fixed_strings.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab (col FixedString(2)) engine = MergeTree() ORDER BY col;
+
+INSERT INTO tab VALUES ('AA') ('Aa');
+
+SELECT col, col LIKE '%a', col ILIKE '%a' FROM tab WHERE col = 'AA';
+SELECT col, col LIKE '%a', col ILIKE '%a' FROM tab WHERE col = 'Aa';
+
+DROP TABLE IF EXISTS tab;
diff --git a/tests/queries/0_stateless/02293_optimize_aggregation_in_order_Array_functions.reference b/tests/queries/0_stateless/02293_optimize_aggregation_in_order_Array_functions.reference
new file mode 100644
index 00000000000..c800527c196
--- /dev/null
+++ b/tests/queries/0_stateless/02293_optimize_aggregation_in_order_Array_functions.reference
@@ -0,0 +1 @@
+[0,1]	[0,1]
diff --git a/tests/queries/0_stateless/02293_optimize_aggregation_in_order_Array_functions.sql b/tests/queries/0_stateless/02293_optimize_aggregation_in_order_Array_functions.sql
new file mode 100644
index 00000000000..2df7c9f2b8f
--- /dev/null
+++ b/tests/queries/0_stateless/02293_optimize_aggregation_in_order_Array_functions.sql
@@ -0,0 +1,5 @@
+drop table if exists data_02293;
+create table data_02293 (a Int64, grp_aggreg AggregateFunction(groupArrayArray, Array(UInt64)), grp_simple SimpleAggregateFunction(groupArrayArray, Array(UInt64))) engine = MergeTree() order by a;
+insert into data_02293 select 1 a, groupArrayArrayState([toUInt64(number)]), groupArrayArray([toUInt64(number)]) from numbers(2) group by a;
+SELECT arraySort(groupArrayArrayMerge(grp_aggreg)) gra , arraySort(groupArrayArray(grp_simple)) grs FROM data_02293 group by a SETTINGS optimize_aggregation_in_order=1;
+drop table data_02293;
diff --git a/tests/queries/0_stateless/02293_selected_rows_and_merges.reference b/tests/queries/0_stateless/02293_selected_rows_and_merges.reference
new file mode 100644
index 00000000000..ad87f9ab5e5
--- /dev/null
+++ b/tests/queries/0_stateless/02293_selected_rows_and_merges.reference
@@ -0,0 +1,2 @@
+0	0	2000000	16000000
+0	0	0	0
diff --git a/tests/queries/0_stateless/02293_selected_rows_and_merges.sh b/tests/queries/0_stateless/02293_selected_rows_and_merges.sh
new file mode 100755
index 00000000000..33bfdd45810
--- /dev/null
+++ b/tests/queries/0_stateless/02293_selected_rows_and_merges.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -ue
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+query_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4()))))")
+
+${CLICKHOUSE_CLIENT} -q "create table tt (x UInt32, y UInt32) engine = MergeTree order by x"
+${CLICKHOUSE_CLIENT} -q "insert into tt select number, 0 from numbers(1e6)"
+${CLICKHOUSE_CLIENT} -q "insert into tt select number, 1 from numbers(1e6)"
+
+${CLICKHOUSE_CLIENT} --optimize_throw_if_noop 1 -q "optimize table tt final" "--query_id=$query_id"
+
+# Here SelectRows and SelectBytes should be zero, MergedRows is 2m and MergedUncompressedBytes is 16m
+${CLICKHOUSE_CLIENT} -q "system flush logs"
+${CLICKHOUSE_CLIENT} -q "select ProfileEvents['SelectedRows'], ProfileEvents['SelecteBytes'], ProfileEvents['MergedRows'], ProfileEvents['MergedUncompressedBytes'] from system.query_log where query_id = '$query_id' and type = 'QueryFinish' and query like 'optimize%' and current_database = currentDatabase()"
+
+${CLICKHOUSE_CLIENT} --mutations_sync 1 -q "alter table tt update y = y + 1 where 1" "--query_id=$query_id"
+${CLICKHOUSE_CLIENT} -q "system flush logs"
+
+# Here for mutation all values are 0, cause mutation is executed async.
+# It's pretty hard to write a test with total counter.
+${CLICKHOUSE_CLIENT} -q "select ProfileEvents['SelectedRows'] > 10, ProfileEvents['SelecteBytes'], ProfileEvents['MergedRows'], ProfileEvents['MergedUncompressedBytes'] from system.query_log where query_id = '$query_id' and type = 'QueryFinish' and query like 'alter%' and current_database = currentDatabase()"
+
+
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index 23bf74139af..7699e803f76 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -76,7 +76,7 @@ export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:="9005"}
 export CLICKHOUSE_PORT_KEEPER=${CLICKHOUSE_PORT_KEEPER:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=keeper_server.tcp_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_KEEPER=${CLICKHOUSE_PORT_KEEPER:="9181"}
 
-export CLICKHOUSE_CLIENT_SECURE=${CLICKHOUSE_CLIENT_SECURE:=$(echo "${CLICKHOUSE_CLIENT}" | sed 's/'"--port=${CLICKHOUSE_PORT_TCP}"'//g; s/$/'"--secure --port=${CLICKHOUSE_PORT_TCP_SECURE}"'/g')}
+export CLICKHOUSE_CLIENT_SECURE=${CLICKHOUSE_CLIENT_SECURE:=$(echo "${CLICKHOUSE_CLIENT}" | sed 's/--secure //' | sed 's/'"--port=${CLICKHOUSE_PORT_TCP}"'//g; s/$/'"--secure --port=${CLICKHOUSE_PORT_TCP_SECURE}"'/g')}
 
 # Add database and log comment to url params
 if [ -v CLICKHOUSE_URL_PARAMS ]
diff --git a/utils/changelog/README.md b/utils/changelog/README.md
index cd8f8da9b61..8218af83d96 100644
--- a/utils/changelog/README.md
+++ b/utils/changelog/README.md
@@ -5,17 +5,14 @@ Generate github token:
 
 Dependencies:
 ```
-sudo apt-get install git curl jq python3 python3-fuzzywuzzy 
-```
-
-Update information about tags:
-```
-git fetch --tags
+sudo apt-get update
+sudo apt-get install git python3 python3-fuzzywuzzy python3-github
+python3 changelog.py -h
 ```
 
 Usage example:
 
 ```
-export GITHUB_USER=... GITHUB_TOKEN=ghp_...
-./changelog.sh v21.5.6.6-stable v21.6.2.7-prestable
+python3 changelog.py --output=changelog-v22.4.1.2305-prestable.md --gh-user-or-token="$GITHUB_TOKEN" v21.6.2.7-prestable
+python3 changelog.py --output=changelog-v22.4.1.2305-prestable.md --gh-user-or-token="$USER" --gh-password="$PASSWORD" v21.6.2.7-prestable
 ```
diff --git a/utils/changelog/changelog.py b/utils/changelog/changelog.py
new file mode 100755
index 00000000000..a846c240055
--- /dev/null
+++ b/utils/changelog/changelog.py
@@ -0,0 +1,379 @@
+#!/usr/bin/env python3
+# In our CI this script runs in style-test containers
+
+import argparse
+import logging
+import re
+from datetime import date, timedelta
+from queue import Empty, Queue
+from subprocess import CalledProcessError, DEVNULL
+from threading import Thread
+from typing import Dict, List, Optional, TextIO
+
+from fuzzywuzzy.fuzz import ratio  # type: ignore
+from github import Github
+from github.NamedUser import NamedUser
+from github.PullRequest import PullRequest
+from github.Repository import Repository
+from git_helper import is_shallow, git_runner as runner
+
+# This array gives the preferred category order, and is also used to
+# normalize category names.
+categories_preferred_order = (
+    "Backward Incompatible Change",
+    "New Feature",
+    "Performance Improvement",
+    "Improvement",
+    "Bug Fix",
+    "Build/Testing/Packaging Improvement",
+    "Other",
+)
+
+FROM_REF = ""
+TO_REF = ""
+
+
+class Description:
+    def __init__(
+        self, number: int, user: NamedUser, html_url: str, entry: str, category: str
+    ):
+        self.number = number
+        self.html_url = html_url
+        self.user = user
+        self.entry = entry
+        self.category = category
+
+    @property
+    def formatted_entry(self) -> str:
+        # Substitute issue links.
+        # 1) issue number w/o markdown link
+        entry = re.sub(
+            r"([^[])#([0-9]{4,})",
+            r"\1[#\2](https://github.com/ClickHouse/ClickHouse/issues/\2)",
+            self.entry,
+        )
+        # 2) issue URL w/o markdown link
+        entry = re.sub(
+            r"([^(])https://github.com/ClickHouse/ClickHouse/issues/([0-9]{4,})",
+            r"\1[#\2](https://github.com/ClickHouse/ClickHouse/issues/\2)",
+            entry,
+        )
+        user_name = self.user.name if self.user.name else self.user.login
+        return (
+            f"* {entry} [#{self.number}]({self.html_url}) "
+            f"([{user_name}]({self.user.html_url}))."
+        )
+
+    # Sort PR descriptions by numbers
+    def __eq__(self, other) -> bool:
+        if not isinstance(self, type(other)):
+            return NotImplemented
+        return self.number == other.number
+
+    def __lt__(self, other: "Description") -> bool:
+        return self.number < other.number
+
+
+class Worker(Thread):
+    def __init__(self, request_queue: Queue, repo: Repository):
+        Thread.__init__(self)
+        self.queue = request_queue
+        self.repo = repo
+        self.response = []  # type: List[Description]
+
+    def run(self):
+        while not self.queue.empty():
+            try:
+                number = self.queue.get()
+            except Empty:
+                break  # possible race condition, just continue
+            api_pr = self.repo.get_pull(number)
+            in_changelog = False
+            merge_commit = api_pr.merge_commit_sha
+            try:
+                runner.run(f"git rev-parse '{merge_commit}'")
+            except CalledProcessError:
+                # It's possible that commit not in the repo, just continue
+                logging.info("PR %s does not belong to the repo", api_pr.number)
+                continue
+
+            try:
+                runner.run(
+                    f"git merge-base --is-ancestor '{merge_commit}' '{TO_REF}'",
+                    stderr=DEVNULL,
+                )
+                runner.run(
+                    f"git merge-base --is-ancestor '{FROM_REF}' '{merge_commit}'",
+                    stderr=DEVNULL,
+                )
+                in_changelog = True
+            except CalledProcessError:
+                # Commit is not between from and to refs
+                continue
+            if in_changelog:
+                desc = generate_description(api_pr, self.repo)
+                if desc is not None:
+                    self.response.append(desc)
+
+            self.queue.task_done()
+
+
+def get_descriptions(
+    repo: Repository, numbers: List[int], jobs: int
+) -> Dict[str, List[Description]]:
+    workers = []  # type: List[Worker]
+    queue = Queue()  # type: Queue # (!?!?!?!??!)
+    for number in numbers:
+        queue.put(number)
+    for _ in range(jobs):
+        worker = Worker(queue, repo)
+        worker.start()
+        workers.append(worker)
+
+    descriptions = {}  # type: Dict[str, List[Description]]
+    for worker in workers:
+        worker.join()
+        for desc in worker.response:
+            if desc.category not in descriptions:
+                descriptions[desc.category] = []
+            descriptions[desc.category].append(desc)
+
+    for descs in descriptions.values():
+        descs.sort()
+
+    return descriptions
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        description="Generate a changelog in MD format between given tags. "
+        "It fetches all tags and unshallow the git repositore automatically",
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="count",
+        default=0,
+        help="set the script verbosity, could be used multiple",
+    )
+    parser.add_argument(
+        "--output",
+        type=argparse.FileType("w"),
+        default="-",
+        help="output file for changelog",
+    )
+    parser.add_argument(
+        "--repo",
+        default="ClickHouse/ClickHouse",
+        help="a repository to query for pull-requests from GitHub",
+    )
+    parser.add_argument(
+        "--jobs",
+        type=int,
+        default=10,
+        help="number of jobs to get pull-requests info from GitHub API",
+    )
+    parser.add_argument(
+        "--gh-user-or-token",
+        help="user name or GH token to authenticate",
+    )
+    parser.add_argument(
+        "--gh-password",
+        help="a password that should be used when user is given",
+    )
+    parser.add_argument(
+        "--from",
+        dest="from_ref",
+        help="git ref for a starting point of changelog, by default is calculated "
+        "automatically to match a previous tag in history",
+    )
+    parser.add_argument(
+        "to_ref",
+        metavar="TO_REF",
+        help="git ref for the changelog end",
+    )
+    args = parser.parse_args()
+    return args
+
+
+# This function mirrors the PR description checks in ClickhousePullRequestTrigger.
+# Returns False if the PR should not be mentioned changelog.
+def generate_description(item: PullRequest, repo: Repository) -> Optional[Description]:
+    backport_number = item.number
+    if item.head.ref.startswith("backport/"):
+        branch_parts = item.head.ref.split("/")
+        if len(branch_parts) == 3:
+            item = repo.get_pull(int(branch_parts[-1]))
+        else:
+            logging.warning(
+                "The branch %s doesn't match backport template, using PR %s as is",
+                item.head.ref,
+                item.number,
+            )
+    description = item.body
+    # Don't skip empty lines because they delimit parts of description
+    lines = [x.strip() for x in (description.split("\n") if description else [])]
+    lines = [re.sub(r"\s+", " ", ln) for ln in lines]
+
+    category = ""
+    entry = ""
+
+    if lines:
+        i = 0
+        while i < len(lines):
+            if re.match(r"(?i)^[#>*_ ]*change\s*log\s*category", lines[i]):
+                i += 1
+                if i >= len(lines):
+                    break
+                # Can have one empty line between header and the category itself.
+                # Filter it out.
+                if not lines[i]:
+                    i += 1
+                    if i >= len(lines):
+                        break
+                category = re.sub(r"^[-*\s]*", "", lines[i])
+                i += 1
+            elif re.match(
+                r"(?i)^[#>*_ ]*(short\s*description|change\s*log\s*entry)", lines[i]
+            ):
+                i += 1
+                # Can have one empty line between header and the entry itself.
+                # Filter it out.
+                if i < len(lines) and not lines[i]:
+                    i += 1
+                # All following lines until empty one are the changelog entry.
+                entry_lines = []
+                while i < len(lines) and lines[i]:
+                    entry_lines.append(lines[i])
+                    i += 1
+                entry = " ".join(entry_lines)
+            else:
+                i += 1
+
+    if not category:
+        # Shouldn't happen, because description check in CI should catch such PRs.
+        # Fall through, so that it shows up in output and the user can fix it.
+        category = "NO CL CATEGORY"
+
+    # Filter out the PR categories that are not for changelog.
+    if re.match(
+        r"(?i)doc|((non|in|not|un)[-\s]*significant)|(not[ ]*for[ ]*changelog)",
+        category,
+    ):
+        return None
+
+    if backport_number != item.number:
+        entry = f"Backported in #{backport_number}: {entry}"
+
+    if not entry:
+        # Shouldn't happen, because description check in CI should catch such PRs.
+        category = "NO CL ENTRY"
+        entry = "NO CL ENTRY:  '" + item.title + "'"
+
+    entry = entry.strip()
+    if entry[-1] != ".":
+        entry += "."
+
+    for c in categories_preferred_order:
+        if ratio(category.lower(), c.lower()) >= 90:
+            category = c
+            break
+
+    return Description(item.number, item.user, item.html_url, entry, category)
+
+
+def write_changelog(fd: TextIO, descriptions: Dict[str, List[Description]]):
+    fd.write(f"### ClickHouse release {TO_REF} FIXME as compared to {FROM_REF}\n\n")
+
+    seen_categories = []  # type: List[str]
+    for category in categories_preferred_order:
+        if category in descriptions:
+            seen_categories.append(category)
+            fd.write(f"#### {category}\n")
+            for desc in descriptions[category]:
+                fd.write(f"{desc.formatted_entry}\n")
+
+            fd.write("\n")
+
+    for category in descriptions:
+        if category not in seen_categories:
+            fd.write(f"#### {category}\n\n")
+            for desc in descriptions[category]:
+                fd.write(f"{desc.formatted_entry}\n")
+
+            fd.write("\n")
+
+
+def check_refs(from_ref: Optional[str], to_ref: str):
+    global FROM_REF, TO_REF
+    TO_REF = to_ref
+
+    # Check TO_REF
+    runner.run(f"git rev-parse {TO_REF}")
+
+    # Check from_ref
+    if from_ref is None:
+        FROM_REF = runner.run(f"git describe --abbrev=0 --tags '{TO_REF}~'")
+        # Check if the previsous tag is different for merge commits
+        # I __assume__ we won't have octopus merges, at least for the tagged commits
+        try:
+            alternative_tag = runner.run(
+                f"git describe --abbrev=0 --tags '{TO_REF}^2'", stderr=DEVNULL
+            )
+            if FROM_REF != alternative_tag:
+                raise Exception(
+                    f"Unable to get unified parent tag for {TO_REF}, "
+                    f"define it manually, get {FROM_REF} and {alternative_tag}"
+                )
+        except CalledProcessError:
+            pass
+    else:
+        runner.run(f"git rev-parse {FROM_REF}")
+        FROM_REF = from_ref
+
+
+def main():
+    log_levels = [logging.CRITICAL, logging.WARN, logging.INFO, logging.DEBUG]
+    args = parse_args()
+    logging.basicConfig(
+        format="%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d]:\n%(message)s",
+        level=log_levels[min(args.verbose, 3)],
+    )
+    # Get the full repo
+    if is_shallow():
+        logging.info("Unshallow repository")
+        runner.run("git fetch --unshallow", stderr=DEVNULL)
+    logging.info("Fetching all tags")
+    runner.run("git fetch --tags", stderr=DEVNULL)
+
+    check_refs(args.from_ref, args.to_ref)
+
+    logging.info("Using %s..%s as changelog interval", FROM_REF, TO_REF)
+
+    # Get starting and ending dates for gathering PRs
+    # Add one day after and before to mitigate TZ possible issues
+    # `tag^{}` format gives commit ref when we have annotated tags
+    from_date = runner.run(f"git log -1 --format=format:%as '{FROM_REF}^{{}}'")
+    from_date = (date.fromisoformat(from_date) - timedelta(1)).isoformat()
+    to_date = runner.run(f"git log -1 --format=format:%as '{TO_REF}^{{}}'")
+    to_date = (date.fromisoformat(to_date) + timedelta(1)).isoformat()
+
+    # Get all PRs for the given time frame
+    gh = Github(
+        args.gh_user_or_token, args.gh_password, per_page=100, pool_size=args.jobs
+    )
+    query = f"type:pr repo:{args.repo} is:merged merged:{from_date}..{to_date}"
+    repo = gh.get_repo(args.repo)
+    api_prs = gh.search_issues(query=query, sort="created")
+    logging.info("Found %s PRs for the query: '%s'", api_prs.totalCount, query)
+
+    pr_numbers = [pr.number for pr in api_prs]
+
+    descriptions = get_descriptions(repo, pr_numbers, args.jobs)
+
+    write_changelog(args.output, descriptions)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/utils/changelog/changelog.sh b/utils/changelog/changelog.sh
deleted file mode 100755
index 52817acfae4..00000000000
--- a/utils/changelog/changelog.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-set -e
-
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-from="$1"
-to="$2"
-log_command=(git log "$from..$to" --first-parent)
-
-"${log_command[@]}" > "changelog-log.txt"
-
-# Check for diamond merges.
-if "${log_command[@]}" --oneline --grep "Merge branch '" | grep ''
-then
-    # DO NOT ADD automated handling of diamond merges to this script.
-    # It is an unsustainable way to work with git, and it MUST be visible.
-    echo Warning: suspected diamond merges above.
-    echo Some commits will be missed, review these manually.
-fi
-
-# Search for PR numbers in commit messages. First variant is normal merge, and second
-# variant is squashed. Next are some backport message variants.
-find_prs=(sed -n "s/^.*merg[eding]*.*#\([[:digit:]]\+\).*$/\1/Ip;
-                  s/^.*(#\([[:digit:]]\+\))$/\1/p;
-                  s/^.*back[- ]*port[ed of]*.*#\([[:digit:]]\+\).*$/\1/Ip;
-                  s/^.*cherry[- ]*pick[ed of]*.*#\([[:digit:]]\+\).*$/\1/Ip")
-
-# awk is to filter out small task numbers from different task tracker, which are
-# referenced by documentation commits like '* DOCSUP-824: query log (#115)'.
-"${find_prs[@]}" "changelog-log.txt" | sort -rn | uniq | awk '$0 > 1000 { print $0 }' > "changelog-prs.txt"
-
-echo "$(wc -l < "changelog-prs.txt") PRs added between $from and $to."
-if [ $(wc -l < "changelog-prs.txt") -eq 0 ] ; then exit 0 ; fi
-
-function github_download()
-{
-    local url=${1}
-    local file=${2}
-    if ! [ -f "$file" ]
-    then
-        echo "curl -u \"$GITHUB_USER:***\" -sSf \"$url\" > \"$file\""
-
-        if ! curl -u "$GITHUB_USER:$GITHUB_TOKEN" \
-                -sSf "$url" \
-                > "$file"
-        then
-            >&2 echo "Failed to download '$url' to '$file'. Contents: '$(cat "$file")'."
-            rm "$file"
-            return 1
-        fi
-        sleep 0.1
-    fi
-}
-
-rm changelog-prs-filtered.txt &> /dev/null ||:
-for pr in $(cat "changelog-prs.txt")
-do
-    # Download PR info from github.
-    file="pr$pr.json"
-    github_download "https://api.github.com/repos/ClickHouse/ClickHouse/pulls/$pr" "$file" || continue
-
-    if ! [ "$pr" == "$(jq -r .number "$file")" ]
-    then
-        >&2 echo "Got wrong data for PR #$pr (please check and remove '$file')."
-        continue
-    fi
-
-    # Filter out PRs by bots.
-    user_login=$(jq -r .user.login "$file")
-
-    filter_bot=$(echo "$user_login" | grep -q "\[bot\]$" && echo "Skip." || echo "Ok." ||:)
-    filter_robot=$(echo "$user_login" | grep -q "robot-clickhouse" && echo "Skip." || echo "Ok." ||:)
-
-    if [ "Skip." == "$filter_robot" ] || [ "Skip." == "$filter_bot" ]
-    then
-        continue
-    fi
-
-    # Download author info from github.
-    user_id=$(jq -r .user.id "$file")
-    user_file="user$user_id.json"
-    github_download "$(jq -r .user.url "$file")" "$user_file" || continue
-
-    if ! [ "$user_id" == "$(jq -r .id "$user_file")" ]
-    then
-        >&2 echo "Got wrong data for user #$user_id (please check and remove '$user_file')."
-        continue
-    fi
-
-    echo "$pr" >> changelog-prs-filtered.txt
-done
-
-echo "### ClickHouse release $to FIXME as compared to $from
-" > changelog.md
-"$script_dir/format-changelog.py" changelog-prs-filtered.txt >> changelog.md
-cat changelog.md
diff --git a/utils/changelog/format-changelog.py b/utils/changelog/format-changelog.py
deleted file mode 100755
index ef1340d48dd..00000000000
--- a/utils/changelog/format-changelog.py
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import collections
-import fuzzywuzzy.fuzz
-import itertools
-import json
-import os
-import re
-import sys
-
-parser = argparse.ArgumentParser(description="Format changelog for given PRs.")
-parser.add_argument(
-    "file",
-    metavar="FILE",
-    type=argparse.FileType("r", encoding="utf-8"),
-    nargs="?",
-    default=sys.stdin,
-    help="File with PR numbers, one per line.",
-)
-args = parser.parse_args()
-
-# This function mirrors the PR description checks in ClickhousePullRequestTrigger.
-# Returns False if the PR should not be mentioned changelog.
-def parse_one_pull_request(item):
-    description = item["body"]
-    # Don't skip empty lines because they delimit parts of description
-    lines = [
-        line
-        for line in [
-            x.strip() for x in (description.split("\n") if description else [])
-        ]
-    ]
-    lines = [re.sub(r"\s+", " ", l) for l in lines]
-
-    category = ""
-    entry = ""
-
-    if lines:
-        i = 0
-        while i < len(lines):
-            if re.match(r"(?i)^[>*_ ]*change\s*log\s*category", lines[i]):
-                i += 1
-                if i >= len(lines):
-                    break
-                # Can have one empty line between header and the category itself. Filter it out.
-                if not lines[i]:
-                    i += 1
-                    if i >= len(lines):
-                        break
-                category = re.sub(r"^[-*\s]*", "", lines[i])
-                i += 1
-            elif re.match(
-                r"(?i)^[>*_ ]*(short\s*description|change\s*log\s*entry)", lines[i]
-            ):
-                i += 1
-                # Can have one empty line between header and the entry itself. Filter it out.
-                if i < len(lines) and not lines[i]:
-                    i += 1
-                # All following lines until empty one are the changelog entry.
-                entry_lines = []
-                while i < len(lines) and lines[i]:
-                    entry_lines.append(lines[i])
-                    i += 1
-                entry = " ".join(entry_lines)
-            else:
-                i += 1
-
-    if not category:
-        # Shouldn't happen, because description check in CI should catch such PRs.
-        # Fall through, so that it shows up in output and the user can fix it.
-        category = "NO CL CATEGORY"
-
-    # Filter out the PR categories that are not for changelog.
-    if re.match(
-        r"(?i)doc|((non|in|not|un)[-\s]*significant)|(not[ ]*for[ ]*changelog)",
-        category,
-    ):
-        return False
-
-    if not entry:
-        # Shouldn't happen, because description check in CI should catch such PRs.
-        category = "NO CL ENTRY"
-        entry = "NO CL ENTRY:  '" + item["title"] + "'"
-
-    entry = entry.strip()
-    if entry[-1] != ".":
-        entry += "."
-
-    item["entry"] = entry
-    item["category"] = category
-
-    return True
-
-
-# This array gives the preferred category order, and is also used to
-# normalize category names.
-categories_preferred_order = [
-    "Backward Incompatible Change",
-    "New Feature",
-    "Performance Improvement",
-    "Improvement",
-    "Bug Fix",
-    "Build/Testing/Packaging Improvement",
-    "Other",
-]
-
-category_to_pr = collections.defaultdict(lambda: [])
-users = {}
-for line in args.file:
-    pr = json.loads(open(f"pr{line.strip()}.json").read())
-    assert pr["number"]
-    if not parse_one_pull_request(pr):
-        continue
-
-    assert pr["category"]
-
-    # Normalize category name
-    for c in categories_preferred_order:
-        if fuzzywuzzy.fuzz.ratio(pr["category"].lower(), c.lower()) >= 90:
-            pr["category"] = c
-            break
-
-    category_to_pr[pr["category"]].append(pr)
-    user_id = pr["user"]["id"]
-    users[user_id] = json.loads(open(f"user{user_id}.json").read())
-
-
-def print_category(category):
-    print(("#### " + category))
-    print()
-    for pr in category_to_pr[category]:
-        user = users[pr["user"]["id"]]
-        user_name = user["name"] if user["name"] else user["login"]
-
-        # Substitute issue links.
-        # 1) issue number w/o markdown link
-        pr["entry"] = re.sub(
-            r"([^[])#([0-9]{4,})",
-            r"\1[#\2](https://github.com/ClickHouse/ClickHouse/issues/\2)",
-            pr["entry"],
-        )
-        # 2) issue URL w/o markdown link
-        pr["entry"] = re.sub(
-            r"([^(])https://github.com/ClickHouse/ClickHouse/issues/([0-9]{4,})",
-            r"\1[#\2](https://github.com/ClickHouse/ClickHouse/issues/\2)",
-            pr["entry"],
-        )
-
-        print(
-            f'* {pr["entry"]} [#{pr["number"]}]({pr["html_url"]}) ([{user_name}]({user["html_url"]})).'
-        )
-
-    print()
-
-
-# Print categories in preferred order
-for category in categories_preferred_order:
-    if category in category_to_pr:
-        print_category(category)
-        category_to_pr.pop(category)
-
-# Print the rest of the categories
-for category in category_to_pr:
-    print_category(category)
diff --git a/utils/changelog/git_helper.py b/utils/changelog/git_helper.py
new file mode 120000
index 00000000000..03b05a7eddd
--- /dev/null
+++ b/utils/changelog/git_helper.py
@@ -0,0 +1 @@
+../../tests/ci/git_helper.py
\ No newline at end of file
diff --git a/utils/changelog/requirements.txt b/utils/changelog/requirements.txt
new file mode 100644
index 00000000000..106e9e2c72d
--- /dev/null
+++ b/utils/changelog/requirements.txt
@@ -0,0 +1,3 @@
+fuzzywuzzy
+PyGitHub
+python-Levenshtein
diff --git a/website/benchmark/hardware/results/powerpc.json b/website/benchmark/hardware/results/powerpc.json
new file mode 100644
index 00000000000..f6701126697
--- /dev/null
+++ b/website/benchmark/hardware/results/powerpc.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "POWER9 x_large VM",
+        "system_full":  "POWER9 x_large VM (8 vCPU, pSeries, 16GiB RAM)",
+        "time":         "2022-05-10 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.263, 0.004, 0.004],
+[0.352, 0.044, 0.040],
+[1.556, 0.087, 0.083],
+[2.341, 0.129, 0.120],
+[0.490, 0.264, 0.258],
+[4.565, 1.059, 1.038],
+[0.042, 0.004, 0.004],
+[0.132, 0.057, 0.062],
+[3.168, 0.915, 0.917],
+[2.020, 1.180, 1.183],
+[1.510, 0.430, 0.435],
+[1.525, 0.552, 0.607],
+[3.104, 1.500, 1.529],
+[2.459, 1.995, 1.975],
+[5.291, 1.847, 1.849],
+[2.552, 1.842, 1.920],
+[7.378, 6.412, 6.283],
+[3.881, 3.592, 3.552],
+[13.757, 10.763, 10.880],
+[0.504, 0.156, 0.134],
+[16.285, 1.777, 1.770],
+[5.135, 2.305, 2.242],
+[21.215, 5.129, 5.183],
+[35.624, 2.645, 2.476],
+[2.648, 0.676, 0.715],
+[0.815, 0.576, 0.568],
+[1.365, 0.746, 0.692],
+[4.857, 1.922, 1.898],
+[14.380, 5.401, 5.445],
+[4.555, 4.535, 4.371],
+[4.095, 1.366, 1.349],
+[7.474, 1.816, 1.859],
+[14.235, 13.406, 13.854],
+[14.165, 9.465, 9.715],
+[11.313, 8.640, 8.462],
+[3.605, 3.009, 2.813],
+[0.662, 0.394, 0.391],
+[0.350, 0.196, 0.194],
+[0.217, 0.150, 0.145],
+[1.025, 0.918, 0.895],
+[0.254, 0.057, 0.057],
+[0.132, 0.045, 0.046],
+[0.047, 0.015, 0.012]
+        ]
+    }
+]