diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 57474c3d9dd..b93c1b61ffd 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -359,15 +359,11 @@ jobs:
     steps:
       - name: Set envs
         run: |
-          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
-          ${{ toJSON(needs) }}
-          EOF
-          )
-          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
           cat >> "$GITHUB_ENV" << 'EOF'
           CHECK_NAME=ClickHouse build check (actions)
           REPORTS_PATH=${{runner.temp}}/reports_dir
           TEMP_PATH=${{runner.temp}}/report_check
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -382,8 +378,11 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
diff --git a/.github/workflows/jepsen.yml b/.github/workflows/jepsen.yml
index 9b7c4e63d48..1682cd1e812 100644
--- a/.github/workflows/jepsen.yml
+++ b/.github/workflows/jepsen.yml
@@ -7,11 +7,8 @@ concurrency:
 on: # yamllint disable-line rule:truthy
   schedule:
     - cron: '0 */6 * * *'
-  workflow_run:
-    workflows: ["PullRequestCI"]
-    types:
-      - completed
   workflow_dispatch:
+  workflow_call:
 jobs:
   KeeperJepsenRelease:
     runs-on: [self-hosted, style-checker]
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 2af54da5e16..e0954aab236 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -215,8 +215,8 @@ jobs:
           fetch-depth: 0 # For a proper version and performance artifacts
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -259,8 +259,8 @@ jobs:
           fetch-depth: 0 # For a proper version and performance artifacts
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -305,8 +305,8 @@ jobs:
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -350,8 +350,8 @@ jobs:
   #       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
+  #         git -C "$GITHUB_WORKSPACE" submodule sync
+  #         git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
   #         sudo rm -fr "$TEMP_PATH"
   #         mkdir -p "$TEMP_PATH"
   #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -395,8 +395,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -440,8 +440,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -485,8 +485,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -530,8 +530,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -575,8 +575,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -623,8 +623,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -668,8 +668,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -715,8 +715,8 @@ jobs:
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -762,8 +762,8 @@ jobs:
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -809,8 +809,8 @@ jobs:
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -856,8 +856,8 @@ jobs:
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -903,8 +903,8 @@ jobs:
           fetch-depth: 0 # otherwise we will have no info about contributors
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -970,16 +970,12 @@ jobs:
     steps:
       - name: Set envs
         run: |
-          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
-          ${{ toJSON(needs) }}
-          EOF
-          )
-          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
           cat >> "$GITHUB_ENV" << 'EOF'
           CHECK_NAME=ClickHouse build check (actions)
           REPORTS_PATH=${{runner.temp}}/reports_dir
           REPORTS_PATH=${{runner.temp}}/reports_dir
           TEMP_PATH=${{runner.temp}}/report_check
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -994,8 +990,11 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
@@ -1018,15 +1017,11 @@ jobs:
     steps:
       - name: Set envs
         run: |
-          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
-          ${{ toJSON(needs) }}
-          EOF
-          )
-          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
           cat >> "$GITHUB_ENV" << 'EOF'
           TEMP_PATH=${{runner.temp}}/report_check
           REPORTS_PATH=${{runner.temp}}/reports_dir
           CHECK_NAME=ClickHouse special build check (actions)
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1041,8 +1036,11 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 01490dff59e..f6e9880d088 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -277,8 +277,8 @@ jobs:
           fetch-depth: 0  # for performance artifact
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -322,8 +322,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -367,8 +367,8 @@ jobs:
   #       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
+  #         git -C "$GITHUB_WORKSPACE" submodule sync
+  #         git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
   #         sudo rm -fr "$TEMP_PATH"
   #         mkdir -p "$TEMP_PATH"
   #         cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -414,8 +414,8 @@ jobs:
           fetch-depth: 0  # for performance artifact
       - name: Build
         run: |
-          git -C "$GITHUB_WORKSPACE" submodule sync --recursive
-          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --recursive --init --jobs=10
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -459,8 +459,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -504,8 +504,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -549,8 +549,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -594,8 +594,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -639,8 +639,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -687,8 +687,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -732,8 +732,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -777,8 +777,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -822,8 +822,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -867,8 +867,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -912,8 +912,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -957,8 +957,8 @@ jobs:
         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
+          git -C "$GITHUB_WORKSPACE" submodule sync
+          git -C "$GITHUB_WORKSPACE" submodule update --depth=1 --init --jobs=10
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
           cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
@@ -1025,15 +1025,11 @@ jobs:
     steps:
       - name: Set envs
         run: |
-          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
-          ${{ toJSON(needs) }}
-          EOF
-          )
-          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
           cat >> "$GITHUB_ENV" << 'EOF'
           CHECK_NAME=ClickHouse build check (actions)
           REPORTS_PATH=${{runner.temp}}/reports_dir
           TEMP_PATH=${{runner.temp}}/report_check
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1048,8 +1044,11 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
@@ -1073,15 +1072,11 @@ jobs:
     steps:
       - name: Set envs
         run: |
-          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
-          ${{ toJSON(needs) }}
-          EOF
-          )
-          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
           cat >> "$GITHUB_ENV" << 'EOF'
           TEMP_PATH=${{runner.temp}}/report_check
           REPORTS_PATH=${{runner.temp}}/reports_dir
           CHECK_NAME=ClickHouse special build check (actions)
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1096,8 +1091,11 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
@@ -3272,6 +3270,13 @@ jobs:
           # shellcheck disable=SC2046
           docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
+#############################################################################################
+###################################### JEPSEN TESTS #########################################
+#############################################################################################
+  Jepsen:
+    needs: [BuilderBinRelease]
+    uses: ./.github/workflows/jepsen.yml
+
   FinishCheck:
     needs:
       - StyleCheck
@@ -3336,6 +3341,7 @@ jobs:
       - SplitBuildSmokeTest
       - CompatibilityCheck
       - IntegrationTestsFlakyCheck
+      - Jepsen
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Clear repository
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index c16a4a6a568..a7a4b62a494 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -442,16 +442,12 @@ jobs:
     steps:
       - name: Set envs
         run: |
-          DEPENDENCIES=$(cat << 'EOF' | jq '. | length'
-          ${{ toJSON(needs) }}
-          EOF
-          )
-          echo "DEPENDENCIES=$DEPENDENCIES" >> "$GITHUB_ENV"
           cat >> "$GITHUB_ENV" << 'EOF'
           CHECK_NAME=ClickHouse build check (actions)
           REPORTS_PATH=${{runner.temp}}/reports_dir
           REPORTS_PATH=${{runner.temp}}/reports_dir
           TEMP_PATH=${{runner.temp}}/report_check
+          NEEDS_DATA_PATH=${{runner.temp}}/needs.json
           EOF
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -466,8 +462,11 @@ jobs:
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
+          cat > "$NEEDS_DATA_PATH" << 'EOF'
+          ${{ toJSON(needs) }}
+          EOF
           cd "$GITHUB_WORKSPACE/tests/ci"
-          python3 build_report_check.py "$CHECK_NAME" "$DEPENDENCIES"
+          python3 build_report_check.py "$CHECK_NAME"
       - name: Cleanup
         if: always()
         run: |
diff --git a/.gitmodules b/.gitmodules
index 55fd684fddb..aa68aa218b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,10 +79,10 @@
 	url = https://github.com/ClickHouse/snappy.git
 [submodule "contrib/cppkafka"]
 	path = contrib/cppkafka
-	url = https://github.com/mfontanini/cppkafka.git
+	url = https://github.com/ClickHouse/cppkafka.git
 [submodule "contrib/brotli"]
 	path = contrib/brotli
-	url = https://github.com/google/brotli.git
+	url = https://github.com/ClickHouse/brotli.git
 [submodule "contrib/h3"]
 	path = contrib/h3
 	url = https://github.com/ClickHouse/h3
@@ -144,7 +144,7 @@
 	ignore = untracked
 [submodule "contrib/msgpack-c"]
 	path = contrib/msgpack-c
-	url = https://github.com/msgpack/msgpack-c
+	url = https://github.com/ClickHouse/msgpack-c
 [submodule "contrib/libcpuid"]
 	path = contrib/libcpuid
 	url = https://github.com/ClickHouse/libcpuid.git
diff --git a/SECURITY.md b/SECURITY.md
index 6c03a6bb945..426559a0439 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -25,9 +25,11 @@ The following versions of ClickHouse server are currently being supported with s
 | 21.10   | :x: |
 | 21.11   | :x: |
 | 21.12   | :x: |
-| 22.1   | ✅ |
-| 22.2   | ✅ |
+| 22.1   | :x: |
+| 22.2   | :x: |
 | 22.3   | ✅ |
+| 22.4   | ✅ |
+| 22.5   | ✅ |
 
 ## Reporting a Vulnerability
 
diff --git a/contrib/amqpcpp-cmake/CMakeLists.txt b/contrib/amqpcpp-cmake/CMakeLists.txt
index 974d097e06f..6e655d3c255 100644
--- a/contrib/amqpcpp-cmake/CMakeLists.txt
+++ b/contrib/amqpcpp-cmake/CMakeLists.txt
@@ -5,6 +5,11 @@ if (NOT ENABLE_AMQPCPP)
     return()
 endif()
 
+if (NOT TARGET ch_contrib::uv)
+    message(STATUS "Not using AMQP-CPP because libuv is disabled")
+    return()
+endif()
+
 set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
 
 set (SRCS
diff --git a/contrib/arrow b/contrib/arrow
index efdcd015cfd..6f274b737c6 160000
--- a/contrib/arrow
+++ b/contrib/arrow
@@ -1 +1 @@
-Subproject commit efdcd015cfdee1b6aa349c9ca227ca12c3d697f5
+Subproject commit 6f274b737c66a6c39bab0d3bdf6cf7d139ef06f5
diff --git a/contrib/brotli b/contrib/brotli
index 63be8a99401..5bd78768449 160000
--- a/contrib/brotli
+++ b/contrib/brotli
@@ -1 +1 @@
-Subproject commit 63be8a99401992075c23e99f7c84de1c653e39e2
+Subproject commit 5bd78768449751a78d4b4c646b0612917986f5b1
diff --git a/contrib/cassandra-cmake/CMakeLists.txt b/contrib/cassandra-cmake/CMakeLists.txt
index 81c1fab3882..986ac438bb2 100644
--- a/contrib/cassandra-cmake/CMakeLists.txt
+++ b/contrib/cassandra-cmake/CMakeLists.txt
@@ -5,6 +5,11 @@ if (NOT ENABLE_CASSANDRA)
     return()
 endif()
 
+if (NOT TARGET ch_contrib::uv)
+    message(STATUS "Not using cassandra because libuv is disabled")
+    return()
+endif()
+
 if (APPLE)
     set(CMAKE_MACOSX_RPATH ON)
 endif()
diff --git a/contrib/cctz b/contrib/cctz
index 9edd0861d83..8c71d74bdf7 160000
--- a/contrib/cctz
+++ b/contrib/cctz
@@ -1 +1 @@
-Subproject commit 9edd0861d8328b2ae77e8fb5f4d7dcd1cf33b42b
+Subproject commit 8c71d74bdf76c3fa401da845089ae60a6c0aeefa
diff --git a/contrib/cppkafka b/contrib/cppkafka
index 5a119f689f8..64bd67db12b 160000
--- a/contrib/cppkafka
+++ b/contrib/cppkafka
@@ -1 +1 @@
-Subproject commit 5a119f689f8a4d90d10a9635e7ee2bee5c127de1
+Subproject commit 64bd67db12b9c705e9127439a5b05b351d9df7da
diff --git a/contrib/msgpack-c b/contrib/msgpack-c
index 46684265d50..790b3fe58eb 160000
--- a/contrib/msgpack-c
+++ b/contrib/msgpack-c
@@ -1 +1 @@
-Subproject commit 46684265d50b5d1b062d4c5c428ba08462844b1d
+Subproject commit 790b3fe58ebded7a8bd130782ef28bec5784c248
diff --git a/contrib/rapidjson b/contrib/rapidjson
index c4ef90ccdbc..b571bd5c1a3 160000
--- a/contrib/rapidjson
+++ b/contrib/rapidjson
@@ -1 +1 @@
-Subproject commit c4ef90ccdbc21d5d5a628d08316bfd301e32d6fa
+Subproject commit b571bd5c1a3b1fc931d77ae36932537a3c9018c3
diff --git a/contrib/snappy b/contrib/snappy
index fb057edfed8..3786173af20 160000
--- a/contrib/snappy
+++ b/contrib/snappy
@@ -1 +1 @@
-Subproject commit fb057edfed820212076239fd32cb2ff23e9016bf
+Subproject commit 3786173af204d21da97180977ad6ab4321138b3d
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 5aaf5dd5511..b01dba1e22f 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -63,7 +63,7 @@ RUN arch=${TARGETARCH:-amd64} \
     && chown clickhouse:clickhouse /var/lib/clickhouse \
     && chown root:clickhouse /var/log/clickhouse-server \
     && chmod +x /entrypoint.sh \
-    && apk add --no-cache su-exec bash tzdata \
+    && apk add --no-cache bash tzdata \
     && cp /usr/share/zoneinfo/UTC /etc/localtime \
     && echo "UTC" > /etc/timezone \
     && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index 6e93bd97036..9e063a006b6 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -3,8 +3,6 @@ FROM ubuntu:20.04
 # see https://github.com/moby/moby/issues/4032#issuecomment-192327844
 ARG DEBIAN_FRONTEND=noninteractive
 
-COPY su-exec.c /su-exec.c
-
 # ARG for quick switch to a given ubuntu mirror
 ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list \
@@ -19,17 +17,11 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
         locales \
         wget \
         tzdata \
-    && apt-get install -y --no-install-recommends tcc libc-dev && \
-        tcc /su-exec.c -o /bin/su-exec && \
-        chown root:root /bin/su-exec && \
-        chmod 0755 /bin/su-exec && \
-        rm /su-exec.c && \
-        apt-get purge -y --auto-remove tcc libc-dev libc-dev-bin libc6-dev linux-libc-dev \
     && apt-get clean
 
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="deb https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION=22.1.1.*
+ARG VERSION=22.5.1.*
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 
 # set non-empty deb_location_url url to create a docker image
@@ -51,21 +43,6 @@ ARG single_binary_location_url=""
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
 
-# To drop privileges, we need 'su' command, that simply changes uid and gid.
-# In fact, the 'su' command from Linux is not so simple, due to inherent vulnerability in Linux:
-# https://ruderich.org/simon/notes/su-sudo-from-root-tty-hijacking
-# It has to mitigate this drawback of Linux, and to do this, 'su' command is creating it's own pseudo-terminal
-# and forwarding commands. Due to some ridiculous curcumstances, it does not work in Docker (or it does)
-# and for these reasons people are using alternatives to the 'su' command in Docker,
-# that don't mess with the terminal, don't care about closing the opened files, etc...
-# but can only be safe to drop privileges inside Docker.
-# The question - what implementation of 'su' command to use.
-# It should be a simple script doing about just two syscalls.
-# Some people tend to use 'gosu' tool that is written in Go.
-# It is not used for several reasons:
-# 1. Dependency on some foreign code in yet another programming language - does not sound alright.
-# 2. Anselmo D. Adams suggested not to use it due to false positive alarms in some undisclosed security scanners.
-
 ARG TARGETARCH
 
 RUN arch=${TARGETARCH:-amd64} \
diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index 20ad0e03bfe..8d46b70cb2c 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -15,29 +15,15 @@ CLICKHOUSE_GID="${CLICKHOUSE_GID:-"$(id -g clickhouse)"}"
 if [ "$(id -u)" = "0" ]; then
     USER=$CLICKHOUSE_UID
     GROUP=$CLICKHOUSE_GID
-    if command -v gosu &> /dev/null; then
-        gosu="gosu $USER:$GROUP"
-    elif command -v su-exec &> /dev/null; then
-        gosu="su-exec $USER:$GROUP"
-    else
-        echo "No gosu/su-exec detected!"
-        exit 1
-    fi
 else
     USER="$(id -u)"
     GROUP="$(id -g)"
-    gosu=""
     DO_CHOWN=0
 fi
 
 # set some vars
 CLICKHOUSE_CONFIG="${CLICKHOUSE_CONFIG:-/etc/clickhouse-server/config.xml}"
 
-if ! $gosu test -f "$CLICKHOUSE_CONFIG" -a -r "$CLICKHOUSE_CONFIG"; then
-    echo "Configuration file '$CLICKHOUSE_CONFIG' isn't readable by user with id '$USER'"
-    exit 1
-fi
-
 # get CH directories locations
 DATA_DIR="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=path || true)"
 TMP_DIR="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=tmp_path || true)"
@@ -65,12 +51,7 @@ do
     # check if variable not empty
     [ -z "$dir" ] && continue
     # ensure directories exist
-    if [ "$DO_CHOWN" = "1" ]; then
-      mkdir="mkdir"
-    else
-      mkdir="$gosu mkdir"
-    fi
-    if ! $mkdir -p "$dir"; then
+    if ! mkdir -p "$dir"; then
         echo "Couldn't create necessary directory: $dir"
         exit 1
     fi
@@ -81,9 +62,6 @@ do
         if [ "$(stat -c %u "$dir")" != "$USER" ] || [ "$(stat -c %g "$dir")" != "$GROUP" ]; then
             chown -R "$USER:$GROUP" "$dir"
         fi
-    elif ! $gosu test -d "$dir" -a -w "$dir" -a -r "$dir"; then
-        echo "Necessary directory '$dir' isn't accessible by user with id '$USER'"
-        exit 1
     fi
 done
 
@@ -117,7 +95,7 @@ if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
     HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port)"
 
     # Listen only on localhost until the initialization is done
-    $gosu /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" -- --listen_host=127.0.0.1 &
+    /usr/bin/clickhouse su "${USER}:${GROUP}" /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" -- --listen_host=127.0.0.1 &
     pid="$!"
 
     # check if clickhouse is ready to accept connections
@@ -173,7 +151,7 @@ if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
     # so the container can't be finished by ctrl+c
     CLICKHOUSE_WATCHDOG_ENABLE=${CLICKHOUSE_WATCHDOG_ENABLE:-0}
     export CLICKHOUSE_WATCHDOG_ENABLE
-    exec $gosu /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" "$@"
+    /usr/bin/clickhouse su "${USER}:${GROUP}" /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" "$@"
 fi
 
 # Otherwise, we assume the user want to run his own process, for example a `bash` shell to explore this image
diff --git a/docker/server/su-exec.c b/docker/server/su-exec.c
deleted file mode 100644
index a375e704f55..00000000000
--- a/docker/server/su-exec.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-
-https://github.com/ncopa/su-exec
-The file is copy-pasted verbatim to avoid supply chain attacks.
-
-The MIT License (MIT)
-
-Copyright (c) 2015 ncopa
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-*/
-
-/* set user and group id and exec */
-
-#include <sys/types.h>
-
-#include <err.h>
-#include <errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static char *argv0;
-
-static void usage(int exitcode)
-{
-	printf("Usage: %s user-spec command [args]\n", argv0);
-	exit(exitcode);
-}
-
-int main(int argc, char *argv[])
-{
-	char *user, *group, **cmdargv;
-	char *end;
-
-	uid_t uid = getuid();
-	gid_t gid = getgid();
-
-	argv0 = argv[0];
-	if (argc < 3)
-		usage(0);
-
-	user = argv[1];
-	group = strchr(user, ':');
-	if (group)
-		*group++ = '\0';
-
-	cmdargv = &argv[2];
-
-	struct passwd *pw = NULL;
-	if (user[0] != '\0') {
-		uid_t nuid = strtol(user, &end, 10);
-		if (*end == '\0')
-			uid = nuid;
-		else {
-			pw = getpwnam(user);
-			if (pw == NULL)
-				err(1, "getpwnam(%s)", user);
-		}
-	}
-	if (pw == NULL) {
-		pw = getpwuid(uid);
-	}
-	if (pw != NULL) {
-		uid = pw->pw_uid;
-		gid = pw->pw_gid;
-	}
-
-	setenv("HOME", pw != NULL ? pw->pw_dir : "/", 1);
-
-	if (group && group[0] != '\0') {
-		/* group was specified, ignore grouplist for setgroups later */
-		pw = NULL;
-
-		gid_t ngid = strtol(group, &end, 10);
-		if (*end == '\0')
-			gid = ngid;
-		else {
-			struct group *gr = getgrnam(group);
-			if (gr == NULL)
-				err(1, "getgrnam(%s)", group);
-			gid = gr->gr_gid;
-		}
-	}
-
-	if (pw == NULL) {
-		if (setgroups(1, &gid) < 0)
-			err(1, "setgroups(%i)", gid);
-	} else {
-		int ngroups = 0;
-		gid_t *glist = NULL;
-
-		while (1) {
-			int r = getgrouplist(pw->pw_name, gid, glist, &ngroups);
-
-			if (r >= 0) {
-				if (setgroups(ngroups, glist) < 0)
-					err(1, "setgroups");
-				break;
-			}
-
-			glist = realloc(glist, ngroups * sizeof(gid_t));
-			if (glist == NULL)
-				err(1, "malloc");
-		}
-	}
-
-	if (setgid(gid) < 0)
-		err(1, "setgid(%i)", gid);
-
-	if (setuid(uid) < 0)
-		err(1, "setuid(%i)", uid);
-
-	execvp(cmdargv[0], cmdargv);
-	err(1, "%s", cmdargv[0]);
-
-	return 1;
-}
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 32799a669eb..69e13973783 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -355,22 +355,8 @@ fi
 cat > report.html <<EOF ||:
 <!DOCTYPE html>
 <html lang="en">
-<link rel="preload" as="font" href="https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2" type="font/woff2" crossorigin="anonymous"/>
   <style>
-@font-face {
-    font-family:'Yandex Sans Display Web';
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot);
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot?#iefix) format('embedded-opentype'),
-            url(https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2) format('woff2'),
-            url(https://yastatic.net/adv-www/_/v2Sve_obH3rKm6rKrtSQpf-eB7U.woff) format('woff'),
-            url(https://yastatic.net/adv-www/_/PzD8hWLMunow5i3RfJ6WQJAL7aI.ttf) format('truetype'),
-            url(https://yastatic.net/adv-www/_/lF_KG5g4tpQNlYIgA0e77fBSZ5s.svg#YandexSansDisplayWeb-Regular) format('svg');
-    font-weight:400;
-    font-style:normal;
-    font-stretch:normal
-}
-
-body { font-family: "Yandex Sans Display Web", Arial, sans-serif; background: #EEE; }
+body { font-family: "DejaVu Sans", "Noto Sans", Arial, sans-serif; background: #EEE; }
 h1 { margin-left: 10px; }
 th, td { border: 0; padding: 5px 10px 5px 10px; text-align: left; vertical-align: top; line-height: 1.5; background-color: #FFF;
 td { white-space: pre; font-family: Monospace, Courier New; }
@@ -378,7 +364,6 @@ border: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0,
 a { color: #06F; text-decoration: none; }
 a:hover, a:active { color: #F40; text-decoration: underline; }
 table { border: 0; }
-.main { margin-left: 10%; }
 p.links a { padding: 5px; margin: 3px; background: #FFF; line-height: 2; white-space: nowrap; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }
 th { cursor: pointer; }
 
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index e2ad91220d3..50632630f1f 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -92,8 +92,6 @@ function run_tests()
 
     if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
         ADDITIONAL_OPTIONS+=('--replicated-database')
-        # Cannot be used with replicated database, due to distributed_ddl_output_mode=none
-        ADDITIONAL_OPTIONS+=('--no-left-queries-check')
         ADDITIONAL_OPTIONS+=('--jobs')
         ADDITIONAL_OPTIONS+=('2')
     else
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index f6d7d6bc5e7..b393c327316 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -121,7 +121,7 @@ There are ordinary functions and aggregate functions. For aggregate functions, s
 
 Ordinary functions do not change the number of rows – they work as if they are processing each row independently. In fact, functions are not called for individual rows, but for `Block`’s of data to implement vectorized query execution.
 
-There are some miscellaneous functions, like [blockSize](../sql-reference/functions/other-functions.md#function-blocksize), [rowNumberInBlock](../sql-reference/functions/other-functions.md#function-rownumberinblock), and [runningAccumulate](../sql-reference/functions/other-functions.md#runningaccumulate), that exploit block processing and violate the independence of rows.
+There are some miscellaneous functions, like [blockSize](../sql-reference/functions/other-functions.md#blocksize-function-blocksize), [rowNumberInBlock](../sql-reference/functions/other-functions.md#rownumberinblock-function-rownumberinblock), and [runningAccumulate](../sql-reference/functions/other-functions.md#runningaccumulate-runningaccumulate), that exploit block processing and violate the independence of rows.
 
 ClickHouse has strong typing, so there’s no implicit type conversion. If a function does not support a specific combination of types, it throws an exception. But functions can work (be overloaded) for many different combinations of types. For example, the `plus` function (to implement the `+` operator) works for any combination of numeric types: `UInt8` + `Float32`, `UInt16` + `Int8`, and so on. Also, some variadic functions can accept any number of arguments, such as the `concat` function.
 
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 7cbe32fdd8b..21ec7cf635b 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -92,16 +92,13 @@ The list of third-party libraries can be obtained by the following query:
 SELECT library_name, license_type, license_path FROM system.licenses ORDER BY library_name COLLATE 'en';
 ```
 
-[Example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
+[Example](https://play.clickhouse.com/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
 
-## Guidelines for adding new third-party libraries and maintaining custom changes in them {#adding-third-party-libraries}
+## Adding new third-party libraries and maintaining patches in third-party libraries {#adding-third-party-libraries}
 
-1. All external third-party code should reside in the dedicated directories under `contrib` directory of ClickHouse repo. Prefer Git submodules, when available.
-2. Fork/mirror the official repo in [Clickhouse-extras](https://github.com/ClickHouse-Extras). Prefer official GitHub repos, when available.
-3. Branch from the branch you want to integrate, e.g., `master` -> `clickhouse/master`, or `release/vX.Y.Z` -> `clickhouse/release/vX.Y.Z`.
-4. All forks in [Clickhouse-extras](https://github.com/ClickHouse-Extras) can be automatically synchronized with upstreams. `clickhouse/...` branches will remain unaffected, since virtually nobody is going to use that naming pattern in their upstream repos.
-5. Add submodules under `contrib` of ClickHouse repo that refer the above forks/mirrors. Set the submodules to track the corresponding `clickhouse/...` branches.
-6. Every time the custom changes have to be made in the library code, a dedicated branch should be created, like `clickhouse/my-fix`. Then this branch should be merged into the branch, that is tracked by the submodule, e.g., `clickhouse/master` or `clickhouse/release/vX.Y.Z`.
-7. No code should be pushed in any branch of the forks in [Clickhouse-extras](https://github.com/ClickHouse-Extras), whose names do not follow `clickhouse/...` pattern.
-8. Always write the custom changes with the official repo in mind. Once the PR is merged from (a feature/fix branch in) your personal fork into the fork in [Clickhouse-extras](https://github.com/ClickHouse-Extras), and the submodule is bumped in ClickHouse repo, consider opening another PR from (a feature/fix branch in) the fork in [Clickhouse-extras](https://github.com/ClickHouse-Extras) to the official repo of the library. This will make sure, that 1) the contribution has more than a single use case and importance, 2) others will also benefit from it, 3) the change will not remain a maintenance burden solely on ClickHouse developers.
-9. When a submodule needs to start using a newer code from the original branch (e.g., `master`), and since the custom changes might be merged in the branch it is tracking (e.g., `clickhouse/master`) and so it may diverge from its original counterpart (i.e., `master`), a careful merge should be carried out first, i.e., `master` -> `clickhouse/master`, and only then the submodule can be bumped in ClickHouse.
+1. Each third-party libary must reside in a dedicated directory under the `contrib/` directory of the ClickHouse repository. Avoid dumps/copies of external code, instead use Git's submodule feature to pull third-party code from an external upstream repository.
+2. Submodules are listed in `.gitmodule`. If the external library can be used as-is, you may reference the upstream repository directly. Otherwise, i.e. the external libary requires patching/customization, create a fork of the official repository in the [Clickhouse organization in GitHub](https://github.com/ClickHouse).
+3. In the latter case, create a branch with `clickhouse/` prefix from the branch you want to integrate, e.g. `clickhouse/master` (for `master`) or `clickhouse/release/vX.Y.Z` (for a `release/vX.Y.Z` tag). The purpose of this branch is to isolate customization of the library from upstream work. For example, pulls from the upstream repository into the fork will leave all `clickhouse/` branches unaffected. Submodules in `contrib/` must only track `clickhouse/` branches of forked third-party repositories.
+4. To patch a fork of a third-party library, create a dedicated branch with `clickhouse/` prefix in the fork, e.g. `clickhouse/fix-some-desaster`. Finally, merge the patch branch into the custom tracking branch (e.g. `clickhouse/master` or `clickhouse/release/vX.Y.Z`) using a PR.
+5. Always create patches of third-party libraries with the official repository in mind. Once a PR of a patch branch to the `clickhouse/` branch in the fork repository is done and the submodule version in ClickHouse's official repository is bumped, consider opening another PR from the patch branch to the upstream library repository. This ensures, that 1) the contribution has more than a single use case and importance, 2) others will also benefit from it, 3) the change will not remain a maintenance burden solely on ClickHouse developers.
+9. To update a submodule with changes in the upstream repository, first merge upstream `master` (or a new `versionX.Y.Z` tag) into the `clickhouse`-tracking branch in the fork repository. Conflicts with patches/customization will need to be resolved in this merge (see Step 4.). Once the merge is done, bump the submodule in ClickHouse to point to the new hash in the fork.
diff --git a/docs/en/getting-started/example-datasets/brown-benchmark.md b/docs/en/getting-started/example-datasets/brown-benchmark.md
index 0960756dbe9..b8e6140c60f 100644
--- a/docs/en/getting-started/example-datasets/brown-benchmark.md
+++ b/docs/en/getting-started/example-datasets/brown-benchmark.md
@@ -411,6 +411,6 @@ ORDER BY yr,
          mo;
 ```
 
-The data is also available for interactive queries in the [Playground](https://gh-api.clickhouse.com/play?user=play), [example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
+The data is also available for interactive queries in the [Playground](https://play.clickhouse.com/play?user=play), [example](https://play.clickhouse.com/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
 
 [Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/brown-benchmark/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/cell-towers.md b/docs/en/getting-started/example-datasets/cell-towers.md
index 7a35a28faa6..8da7761eea4 100644
--- a/docs/en/getting-started/example-datasets/cell-towers.md
+++ b/docs/en/getting-started/example-datasets/cell-towers.md
@@ -126,6 +126,6 @@ SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM
 1 rows in set. Elapsed: 0.067 sec. Processed 43.28 million rows, 692.42 MB (645.83 million rows/s., 10.33 GB/s.)
 ```
 
-The data is also available for interactive queries in the [Playground](https://gh-api.clickhouse.com/play?user=play), [example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=).
+The data is also available for interactive queries in the [Playground](https://play.clickhouse.com/play?user=play), [example](https://play.clickhouse.com/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=).
 
-Although you cannot create temporary tables there.
\ No newline at end of file
+Although you cannot create temporary tables there.
diff --git a/docs/en/getting-started/example-datasets/menus.md b/docs/en/getting-started/example-datasets/menus.md
index c572dcdb491..fd20c75f707 100644
--- a/docs/en/getting-started/example-datasets/menus.md
+++ b/docs/en/getting-started/example-datasets/menus.md
@@ -351,4 +351,4 @@ At least they have caviar with vodka. Very nice.
 
 ## Online Playground {#playground}
 
-The data is uploaded to ClickHouse Playground, [example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUCiAgICByb3VuZCh0b1VJbnQzMk9yWmVybyhleHRyYWN0KG1lbnVfZGF0ZSwgJ15cXGR7NH0nKSksIC0xKSBBUyBkLAogICAgY291bnQoKSwKICAgIHJvdW5kKGF2ZyhwcmljZSksIDIpLAogICAgYmFyKGF2ZyhwcmljZSksIDAsIDUwLCAxMDApLAogICAgYW55KGRpc2hfbmFtZSkKRlJPTSBtZW51X2l0ZW1fZGVub3JtCldIRVJFIChtZW51X2N1cnJlbmN5IElOICgnRG9sbGFycycsICcnKSkgQU5EIChkID4gMCkgQU5EIChkIDwgMjAyMikgQU5EIChkaXNoX25hbWUgSUxJS0UgJyVjYXZpYXIlJykKR1JPVVAgQlkgZApPUkRFUiBCWSBkIEFTQw==).
+The data is uploaded to ClickHouse Playground, [example](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICByb3VuZCh0b1VJbnQzMk9yWmVybyhleHRyYWN0KG1lbnVfZGF0ZSwgJ15cXGR7NH0nKSksIC0xKSBBUyBkLAogICAgY291bnQoKSwKICAgIHJvdW5kKGF2ZyhwcmljZSksIDIpLAogICAgYmFyKGF2ZyhwcmljZSksIDAsIDUwLCAxMDApLAogICAgYW55KGRpc2hfbmFtZSkKRlJPTSBtZW51X2l0ZW1fZGVub3JtCldIRVJFIChtZW51X2N1cnJlbmN5IElOICgnRG9sbGFycycsICcnKSkgQU5EIChkID4gMCkgQU5EIChkIDwgMjAyMikgQU5EIChkaXNoX25hbWUgSUxJS0UgJyVjYXZpYXIlJykKR1JPVVAgQlkgZApPUkRFUiBCWSBkIEFTQw==).
diff --git a/docs/en/getting-started/example-datasets/ontime.md b/docs/en/getting-started/example-datasets/ontime.md
index aa181a7deff..a3af800f038 100644
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@@ -5,20 +5,9 @@ description: Dataset containing the on-time performance of airline flights
 
 # OnTime 
 
-This dataset can be obtained in two ways:
+This dataset contains data from Bureau of Transportation Statistics.
 
--   import from raw data
--   download of prepared partitions
-
-## Import from Raw Data {#import-from-raw-data}
-
-Downloading data:
-
-``` bash
-wget --no-check-certificate --continue https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performance_1987_present_{1987..2021}_{1..12}.zip
-```
-
-Creating a table:
+## Creating a table
 
 ``` sql
 CREATE TABLE `ontime`
@@ -29,140 +18,138 @@ CREATE TABLE `ontime`
     `DayofMonth`                      UInt8,
     `DayOfWeek`                       UInt8,
     `FlightDate`                      Date,
-    `Reporting_Airline`               String,
+    `Reporting_Airline`               LowCardinality(String),
     `DOT_ID_Reporting_Airline`        Int32,
-    `IATA_CODE_Reporting_Airline`     String,
-    `Tail_Number`                     String,
-    `Flight_Number_Reporting_Airline` String,
+    `IATA_CODE_Reporting_Airline`     LowCardinality(String),
+    `Tail_Number`                     LowCardinality(String),
+    `Flight_Number_Reporting_Airline` LowCardinality(String),
     `OriginAirportID`                 Int32,
     `OriginAirportSeqID`              Int32,
     `OriginCityMarketID`              Int32,
     `Origin`                          FixedString(5),
-    `OriginCityName`                  String,
+    `OriginCityName`                  LowCardinality(String),
     `OriginState`                     FixedString(2),
-    `OriginStateFips`                 String,
-    `OriginStateName`                 String,
+    `OriginStateFips`                 FixedString(2),
+    `OriginStateName`                 LowCardinality(String),
     `OriginWac`                       Int32,
     `DestAirportID`                   Int32,
     `DestAirportSeqID`                Int32,
     `DestCityMarketID`                Int32,
     `Dest`                            FixedString(5),
-    `DestCityName`                    String,
+    `DestCityName`                    LowCardinality(String),
     `DestState`                       FixedString(2),
-    `DestStateFips`                   String,
-    `DestStateName`                   String,
+    `DestStateFips`                   FixedString(2),
+    `DestStateName`                   LowCardinality(String),
     `DestWac`                         Int32,
     `CRSDepTime`                      Int32,
     `DepTime`                         Int32,
     `DepDelay`                        Int32,
     `DepDelayMinutes`                 Int32,
     `DepDel15`                        Int32,
-    `DepartureDelayGroups`            String,
-    `DepTimeBlk`                      String,
+    `DepartureDelayGroups`            LowCardinality(String),
+    `DepTimeBlk`                      LowCardinality(String),
     `TaxiOut`                         Int32,
-    `WheelsOff`                       Int32,
-    `WheelsOn`                        Int32,
+    `WheelsOff`                       LowCardinality(String),
+    `WheelsOn`                        LowCardinality(String),
     `TaxiIn`                          Int32,
     `CRSArrTime`                      Int32,
     `ArrTime`                         Int32,
     `ArrDelay`                        Int32,
     `ArrDelayMinutes`                 Int32,
     `ArrDel15`                        Int32,
-    `ArrivalDelayGroups`              Int32,
-    `ArrTimeBlk`                      String,
-    `Cancelled`                       UInt8,
+    `ArrivalDelayGroups`              LowCardinality(String),
+    `ArrTimeBlk`                      LowCardinality(String),
+    `Cancelled`                       Int8,
     `CancellationCode`                FixedString(1),
-    `Diverted`                        UInt8,
+    `Diverted`                        Int8,
     `CRSElapsedTime`                  Int32,
     `ActualElapsedTime`               Int32,
-    `AirTime`                         Nullable(Int32),
+    `AirTime`                         Int32,
     `Flights`                         Int32,
     `Distance`                        Int32,
-    `DistanceGroup`                   UInt8,
+    `DistanceGroup`                   Int8,
     `CarrierDelay`                    Int32,
     `WeatherDelay`                    Int32,
     `NASDelay`                        Int32,
     `SecurityDelay`                   Int32,
     `LateAircraftDelay`               Int32,
-    `FirstDepTime`                    String,
-    `TotalAddGTime`                   String,
-    `LongestAddGTime`                 String,
-    `DivAirportLandings`              String,
-    `DivReachedDest`                  String,
-    `DivActualElapsedTime`            String,
-    `DivArrDelay`                     String,
-    `DivDistance`                     String,
-    `Div1Airport`                     String,
+    `FirstDepTime`                    Int16,
+    `TotalAddGTime`                   Int16,
+    `LongestAddGTime`                 Int16,
+    `DivAirportLandings`              Int8,
+    `DivReachedDest`                  Int8,
+    `DivActualElapsedTime`            Int16,
+    `DivArrDelay`                     Int16,
+    `DivDistance`                     Int16,
+    `Div1Airport`                     LowCardinality(String),
     `Div1AirportID`                   Int32,
     `Div1AirportSeqID`                Int32,
-    `Div1WheelsOn`                    String,
-    `Div1TotalGTime`                  String,
-    `Div1LongestGTime`                String,
-    `Div1WheelsOff`                   String,
-    `Div1TailNum`                     String,
-    `Div2Airport`                     String,
+    `Div1WheelsOn`                    Int16,
+    `Div1TotalGTime`                  Int16,
+    `Div1LongestGTime`                Int16,
+    `Div1WheelsOff`                   Int16,
+    `Div1TailNum`                     LowCardinality(String),
+    `Div2Airport`                     LowCardinality(String),
     `Div2AirportID`                   Int32,
     `Div2AirportSeqID`                Int32,
-    `Div2WheelsOn`                    String,
-    `Div2TotalGTime`                  String,
-    `Div2LongestGTime`                String,
-    `Div2WheelsOff`                   String,
-    `Div2TailNum`                     String,
-    `Div3Airport`                     String,
+    `Div2WheelsOn`                    Int16,
+    `Div2TotalGTime`                  Int16,
+    `Div2LongestGTime`                Int16,
+    `Div2WheelsOff`                   Int16,
+    `Div2TailNum`                     LowCardinality(String),
+    `Div3Airport`                     LowCardinality(String),
     `Div3AirportID`                   Int32,
     `Div3AirportSeqID`                Int32,
-    `Div3WheelsOn`                    String,
-    `Div3TotalGTime`                  String,
-    `Div3LongestGTime`                String,
-    `Div3WheelsOff`                   String,
-    `Div3TailNum`                     String,
-    `Div4Airport`                     String,
+    `Div3WheelsOn`                    Int16,
+    `Div3TotalGTime`                  Int16,
+    `Div3LongestGTime`                Int16,
+    `Div3WheelsOff`                   Int16,
+    `Div3TailNum`                     LowCardinality(String),
+    `Div4Airport`                     LowCardinality(String),
     `Div4AirportID`                   Int32,
     `Div4AirportSeqID`                Int32,
-    `Div4WheelsOn`                    String,
-    `Div4TotalGTime`                  String,
-    `Div4LongestGTime`                String,
-    `Div4WheelsOff`                   String,
-    `Div4TailNum`                     String,
-    `Div5Airport`                     String,
+    `Div4WheelsOn`                    Int16,
+    `Div4TotalGTime`                  Int16,
+    `Div4LongestGTime`                Int16,
+    `Div4WheelsOff`                   Int16,
+    `Div4TailNum`                     LowCardinality(String),
+    `Div5Airport`                     LowCardinality(String),
     `Div5AirportID`                   Int32,
     `Div5AirportSeqID`                Int32,
-    `Div5WheelsOn`                    String,
-    `Div5TotalGTime`                  String,
-    `Div5LongestGTime`                String,
-    `Div5WheelsOff`                   String,
-    `Div5TailNum`                     String
+    `Div5WheelsOn`                    Int16,
+    `Div5TotalGTime`                  Int16,
+    `Div5LongestGTime`                Int16,
+    `Div5WheelsOff`                   Int16,
+    `Div5TailNum`                     LowCardinality(String)
 ) ENGINE = MergeTree
-      PARTITION BY Year
-      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
-      SETTINGS index_granularity = 8192;
+  ORDER BY (Year, Quarter, Month, DayofMonth, FlightDate, IATA_CODE_Reporting_Airline);
+```
+
+## Import from Raw Data {#import-from-raw-data}
+
+Downloading data:
+
+``` bash
+wget --no-check-certificate --continue https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performance_1987_present_{1987..2022}_{1..12}.zip
 ```
 
 Loading data with multiple threads:
 
 ``` bash
-ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_csv_empty_as_default 1 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```
 
 (if you will have memory shortage or other issues on your server, remove the `-P $(nproc)` part)
 
-## Download of Prepared Partitions {#download-of-prepared-partitions}
+## Import from a saved copy
 
-``` bash
-$ curl -O https://datasets.clickhouse.com/ontime/partitions/ontime.tar
-$ tar xvf ontime.tar -C /var/lib/clickhouse # path to ClickHouse data directory
-$ # check permissions of unpacked data, fix if required
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "select count(*) from datasets.ontime"
+Alternatively, you can import data from a saved copy by the following query:
+
+```
+INSERT INTO ontime SELECT * FROM s3('https://clickhouse-public-datasets.s3.amazonaws.com/ontime/csv_by_year/*.csv.gz', CSVWithNames) SETTINGS max_insert_threads = 40;
 ```
 
-:::note    
-If you will run the queries described below, you have to use the full table name, `datasets.ontime`.
-:::
-
-
-!!! info "Info"
-    If you are using the prepared partitions or the Online Playground replace any occurrence of `IATA_CODE_Reporting_Airline` or `IATA_CODE_Reporting_Airline AS Carrier` in the following queries with `Carrier` (see `describe ontime`).
+The snapshot was created on 2022-05-29.
 
 ## Queries {#queries}
 
@@ -398,7 +385,7 @@ ORDER BY c DESC
 LIMIT 10;
 ```
 
-You can also play with the data in Playground, [example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIERheU9mV2VlaywgY291bnQoKikgQVMgYwpGUk9NIG9udGltZQpXSEVSRSBZZWFyPj0yMDAwIEFORCBZZWFyPD0yMDA4CkdST1VQIEJZIERheU9mV2VlawpPUkRFUiBCWSBjIERFU0M7Cg==).
+You can also play with the data in Playground, [example](https://play.clickhouse.com/play?user=play#U0VMRUNUIERheU9mV2VlaywgY291bnQoKikgQVMgYwpGUk9NIG9udGltZQpXSEVSRSBZZWFyPj0yMDAwIEFORCBZZWFyPD0yMDA4CkdST1VQIEJZIERheU9mV2VlawpPUkRFUiBCWSBjIERFU0M7Cg==).
 
 This performance test was created by Vadim Tkachenko. See:
 
diff --git a/docs/en/getting-started/example-datasets/opensky.md b/docs/en/getting-started/example-datasets/opensky.md
index f55ebc79590..b38021c34eb 100644
--- a/docs/en/getting-started/example-datasets/opensky.md
+++ b/docs/en/getting-started/example-datasets/opensky.md
@@ -417,4 +417,4 @@ Result:
 
 ### Online Playground {#playground}
 
-You can test other queries to this data set using the interactive resource [Online Playground](https://gh-api.clickhouse.com/play?user=play). For example, [like this](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUCiAgICBvcmlnaW4sCiAgICBjb3VudCgpLAogICAgcm91bmQoYXZnKGdlb0Rpc3RhbmNlKGxvbmdpdHVkZV8xLCBsYXRpdHVkZV8xLCBsb25naXR1ZGVfMiwgbGF0aXR1ZGVfMikpKSBBUyBkaXN0YW5jZSwKICAgIGJhcihkaXN0YW5jZSwgMCwgMTAwMDAwMDAsIDEwMCkgQVMgYmFyCkZST00gb3BlbnNreQpXSEVSRSBvcmlnaW4gIT0gJycKR1JPVVAgQlkgb3JpZ2luCk9SREVSIEJZIGNvdW50KCkgREVTQwpMSU1JVCAxMDA=). However, please note that you cannot create temporary tables here.
+You can test other queries to this data set using the interactive resource [Online Playground](https://play.clickhouse.com/play?user=play). For example, [like this](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICBvcmlnaW4sCiAgICBjb3VudCgpLAogICAgcm91bmQoYXZnKGdlb0Rpc3RhbmNlKGxvbmdpdHVkZV8xLCBsYXRpdHVkZV8xLCBsb25naXR1ZGVfMiwgbGF0aXR1ZGVfMikpKSBBUyBkaXN0YW5jZSwKICAgIGJhcihkaXN0YW5jZSwgMCwgMTAwMDAwMDAsIDEwMCkgQVMgYmFyCkZST00gb3BlbnNreQpXSEVSRSBvcmlnaW4gIT0gJycKR1JPVVAgQlkgb3JpZ2luCk9SREVSIEJZIGNvdW50KCkgREVTQwpMSU1JVCAxMDA=). However, please note that you cannot create temporary tables here.
diff --git a/docs/en/getting-started/example-datasets/recipes.md b/docs/en/getting-started/example-datasets/recipes.md
index 5b10c7c9c2c..37a6eeebea5 100644
--- a/docs/en/getting-started/example-datasets/recipes.md
+++ b/docs/en/getting-started/example-datasets/recipes.md
@@ -334,6 +334,6 @@ Result:
 
 ### Online Playground
 
-The dataset is also available in the [Online Playground](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+The dataset is also available in the [Online Playground](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
 
 [Original article](https://clickhouse.com/docs/en/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/star-schema.md b/docs/en/getting-started/example-datasets/star-schema.md
index 35ff492c360..4756aedd08c 100644
--- a/docs/en/getting-started/example-datasets/star-schema.md
+++ b/docs/en/getting-started/example-datasets/star-schema.md
@@ -26,7 +26,6 @@ $ ./dbgen -s 1000 -T c
 $ ./dbgen -s 1000 -T l
 $ ./dbgen -s 1000 -T p
 $ ./dbgen -s 1000 -T s
-$ ./dbgen -s 1000 -T d
 ```
 
 Creating tables in ClickHouse:
@@ -109,10 +108,8 @@ Converting “star schema” to denormalized “flat schema”:
 SET max_memory_usage = 20000000000;
 
 CREATE TABLE lineorder_flat
-ENGINE = MergeTree
-PARTITION BY toYear(LO_ORDERDATE)
-ORDER BY (LO_ORDERDATE, LO_ORDERKEY) AS
-SELECT
+ENGINE = MergeTree ORDER BY (LO_ORDERDATE, LO_ORDERKEY)
+AS SELECT
     l.LO_ORDERKEY AS LO_ORDERKEY,
     l.LO_LINENUMBER AS LO_LINENUMBER,
     l.LO_CUSTKEY AS LO_CUSTKEY,
diff --git a/docs/en/getting-started/example-datasets/uk-price-paid.md b/docs/en/getting-started/example-datasets/uk-price-paid.md
index eaec6e53ed4..b7a486fb057 100644
--- a/docs/en/getting-started/example-datasets/uk-price-paid.md
+++ b/docs/en/getting-started/example-datasets/uk-price-paid.md
@@ -646,4 +646,4 @@ no projection: 100 rows in set. Elapsed: 0.069 sec. Processed 26.32 million rows
 
 ### Test It in Playground {#playground}
 
-The dataset is also available in the [Online Playground](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIHRvd24sIGRpc3RyaWN0LCBjb3VudCgpIEFTIGMsIHJvdW5kKGF2ZyhwcmljZSkpIEFTIHByaWNlLCBiYXIocHJpY2UsIDAsIDUwMDAwMDAsIDEwMCkgRlJPTSB1a19wcmljZV9wYWlkIFdIRVJFIGRhdGUgPj0gJzIwMjAtMDEtMDEnIEdST1VQIEJZIHRvd24sIGRpc3RyaWN0IEhBVklORyBjID49IDEwMCBPUkRFUiBCWSBwcmljZSBERVNDIExJTUlUIDEwMA==).
+The dataset is also available in the [Online Playground](https://play.clickhouse.com/play?user=play#U0VMRUNUIHRvd24sIGRpc3RyaWN0LCBjb3VudCgpIEFTIGMsIHJvdW5kKGF2ZyhwcmljZSkpIEFTIHByaWNlLCBiYXIocHJpY2UsIDAsIDUwMDAwMDAsIDEwMCkgRlJPTSB1a19wcmljZV9wYWlkIFdIRVJFIGRhdGUgPj0gJzIwMjAtMDEtMDEnIEdST1VQIEJZIHRvd24sIGRpc3RyaWN0IEhBVklORyBjID49IDEwMCBPUkRFUiBCWSBwcmljZSBERVNDIExJTUlUIDEwMA==).
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 31f948cbb00..1828a1d0be6 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -149,6 +149,8 @@ Each element of [Nested](../sql-reference/data-types/nested-data-structures/nest
 In input data, ENUM values can be represented as names or as ids. First, we try to match the input value to the ENUM name. If we fail and the input value is a number, we try to match this number to ENUM id.
 If input data contains only ENUM ids, it's recommended to enable the setting [input_format_tsv_enum_as_number](../operations/settings/settings.md#settings-input_format_tsv_enum_as_number) to optimize ENUM parsing.
 
+While importing data, you can skip some first rows using setting [input_format_tsv_skip_first_lines](../operations/settings/settings.md#settings-input_format_tsv_skip_first_lines)
+
 For example:
 
 ``` sql
@@ -429,6 +431,8 @@ If input data contains only ENUM ids, it's recommended to enable the setting [in
 
 The CSV format supports the output of totals and extremes the same way as `TabSeparated`.
 
+While importing data, you can skip some first rows using setting [input_format_csv_skip_first_lines](../operations/settings/settings.md#settings-input_format_csv_skip_first_lines)
+
 ## CSVWithNames {#csvwithnames}
 
 Also prints the header row with column names, similar to [TabSeparatedWithNames](#tabseparatedwithnames).
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index 92d00f2812c..210c60cc71f 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -147,6 +147,16 @@ Features:
 
 [Zeppelin-Interpreter-for-ClickHouse](https://github.com/SiderZhang/Zeppelin-Interpreter-for-ClickHouse) is a [Zeppelin](https://zeppelin.apache.org) interpreter for ClickHouse. Compared with JDBC interpreter, it can provide better timeout control for long running queries.
 
+### ClickCat {#clickcat}
+
+[ClickCat](https://github.com/open-botech/ClickCat) is a firendly user interface that lets you search, explore and visualize your ClickHouse Data.
+
+Features:
+
+-   An online SQL editor which can run your SQL code without any installing.
+-   You can observe all processes and mutations. For those unfinished processes, you can kill them in ui.
+-   The Metrics contains Cluster Analysis,Data Analysis,Query Analysis.
+
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index f2427810184..27e81256315 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -5,7 +5,7 @@ sidebar_label: Caches
 
 # Cache Types {#cache-types}
 
-When performing queries, ClichHouse uses different caches.
+When performing queries, ClickHouse uses different caches.
 
 Main cache types:
 
diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 44f6a57f6d4..e4d10967bc8 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -5,15 +5,15 @@ sidebar_label: ClickHouse Keeper
 
 # ClickHouse Keeper {#clickHouse-keeper}
 
-ClickHouse server uses [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
+ClickHouse Keeper provides the coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is compatible with ZooKeeper.
 
 ## Implementation details {#implementation-details}
 
-ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper is written in C++ and uses [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
+ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, and has quite a simple and powerful data model. ZooKeeper's coordination algorithm, ZooKeeper Atomic Broadcast (ZAB), doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper is written in C++ and uses the [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows linearizability for reads and writes, and has several open-source implementations in different languages.
 
-By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to ClickHouse Keeper snapshot. Interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
+By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but the `clickhouse-keeper-converter` tool enables the conversion of ZooKeeper data to ClickHouse Keeper snapshots. The interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so a mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
 
-ClickHouse Keeper supports Access Control List (ACL) the same way as [ZooKeeper](https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) does. ClickHouse Keeper supports the same set of permissions and has the identical built-in schemes: `world`, `auth`, `digest`, `host` and `ip`. Digest authentication scheme uses pair `username:password`. Password is encoded in Base64.
+ClickHouse Keeper supports Access Control Lists (ACLs) the same way as [ZooKeeper](https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) does. ClickHouse Keeper supports the same set of permissions and has the identical built-in schemes: `world`, `auth` and `digest`. The digest authentication scheme uses the pair `username:password`, the password is encoded in Base64.
 
 :::note
 External integrations are not supported.
@@ -21,25 +21,25 @@ External integrations are not supported.
 
 ## Configuration {#configuration}
 
-ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse server, but in both cases configuration is almost the same `.xml` file. The main ClickHouse Keeper configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
+ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse server. In both cases the configuration is almost the same `.xml` file. The main ClickHouse Keeper configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
 
 -    `tcp_port` — Port for a client to connect (default for ZooKeeper is `2181`).
 -    `tcp_port_secure` — Secure port for an SSL connection between client and keeper-server.
 -    `server_id` — Unique server id, each participant of the ClickHouse Keeper cluster must have a unique number (1, 2, 3, and so on).
--    `log_storage_path` — Path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper).
+-    `log_storage_path` — Path to coordination logs, just like ZooKeeper it is best to store logs on non-busy nodes.
 -    `snapshot_storage_path` — Path to coordination snapshots.
 
 Other common parameters are inherited from the ClickHouse server config (`listen_host`, `logger`, and so on).
 
-Internal coordination settings are located in `<keeper_server>.<coordination_settings>` section:
+Internal coordination settings are located in the `<keeper_server>.<coordination_settings>` section:
 
 -    `operation_timeout_ms` — Timeout for a single client operation (ms) (default: 10000).
 -    `min_session_timeout_ms` — Min timeout for client session (ms) (default: 10000).
 -    `session_timeout_ms` — Max timeout for client session (ms) (default: 100000).
--    `dead_session_check_period_ms` — How often ClickHouse Keeper check dead sessions and remove them (ms) (default: 500).
+-    `dead_session_check_period_ms` — How often ClickHouse Keeper checks for dead sessions and removes them (ms) (default: 500).
 -    `heart_beat_interval_ms` — How often a ClickHouse Keeper leader will send heartbeats to followers (ms) (default: 500).
--    `election_timeout_lower_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000).
--    `election_timeout_upper_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000).
+-    `election_timeout_lower_bound_ms` — If the follower does not receive a heartbeat from the leader in this interval, then it can initiate leader election (default: 1000).
+-    `election_timeout_upper_bound_ms` — If the follower does not receive a heartbeat from the leader in this interval, then it must initiate leader election (default: 2000).
 -    `rotate_log_storage_interval` — How many log records to store in a single file (default: 100000).
 -    `reserved_log_items` — How many coordination log records to store before compaction (default: 100000).
 -    `snapshot_distance` — How often ClickHouse Keeper will create new snapshots (in the number of records in logs) (default: 100000).
@@ -55,7 +55,7 @@ Internal coordination settings are located in `<keeper_server>.<coordination_set
 -    `startup_timeout` — If the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000).
 -    `four_letter_word_white_list` — White list of 4lw commands (default: "conf,cons,crst,envi,ruok,srst,srvr,stat,wchc,wchs,dirs,mntr,isro").
 
-Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description.
+Quorum configuration is located in the `<keeper_server>.<raft_configuration>` section and contain servers description.
 
 The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The parameter can be set `true` if SSL connection is required for internal communication between nodes, or left unspecified otherwise.
 
@@ -66,7 +66,7 @@ The main parameters for each `<server>` are:
 -    `port` — Port where this server listens for connections.
 
 :::note
-In the case of a change in the topology of your ClickHouse Keeper cluster (eg. replacing a server), please make sure to keep the mapping `server_id` to `hostname` consistent and avoid shuffling or reusing an existing `server_id` for different servers (eg. it can happen if your rely on automation scripts to deploy ClickHouse Keeper)
+In the case of a change in the topology of your ClickHouse Keeper cluster (e.g., replacing a server), please make sure to keep the mapping of `server_id` to `hostname` consistent and avoid shuffling or reusing an existing `server_id` for different servers (e.g., it can happen if your rely on automation scripts to deploy ClickHouse Keeper)
 :::
 
 Examples of configuration for quorum with three nodes can be found in [integration tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) with `test_keeper_` prefix. Example configuration for server #1:
@@ -112,7 +112,7 @@ ClickHouse Keeper is bundled into the ClickHouse server package, just add config
 clickhouse-keeper --config /etc/your_path_to_config/config.xml
 ```
 
-If you don't have the symlink (`clickhouse-keeper`) you can create it or specify `keeper` as argument:
+If you don't have the symlink (`clickhouse-keeper`) you can create it or specify `keeper` as an argument to `clickhouse`:
 
 ```bash
 clickhouse keeper --config /etc/your_path_to_config/config.xml
diff --git a/docs/en/operations/configuration-files.md b/docs/en/operations/configuration-files.md
index 582e90544e0..4a5431fa57c 100644
--- a/docs/en/operations/configuration-files.md
+++ b/docs/en/operations/configuration-files.md
@@ -34,7 +34,7 @@ You can also declare attributes as coming from environment variables by using `f
 
 The config can also define “substitutions”. If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/clickhouse/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md#macros)).
 
-If you want to replace an entire element with a substitution use `include` as element name.
+If you want to replace an entire element with a substitution use `include` as the element name.
 
 XML substitution example:
 
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 01177d6aae4..b672da83441 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -114,7 +114,7 @@ A large number of parts in a table reduces performance of ClickHouse queries and
 
 ## replicated_deduplication_window {#replicated-deduplication-window}
 
-The number of most recently inserted blocks for which Zookeeper stores hash sums to check for duplicates.
+The number of most recently inserted blocks for which ClickHouse Keeper stores hash sums to check for duplicates.
 
 Possible values:
 
@@ -123,7 +123,7 @@ Possible values:
 
 Default value: 100.
 
-The `Insert` command creates one or more blocks (parts). When inserting into Replicated tables, ClickHouse for [insert deduplication](../../engines/table-engines/mergetree-family/replication/) writes the hash sums of the created parts into Zookeeper. Hash sums are stored only for the most recent `replicated_deduplication_window` blocks. The oldest hash sums are removed from Zookeeper.
+The `Insert` command creates one or more blocks (parts). For [insert deduplication](../../engines/table-engines/mergetree-family/replication/), when writing into replicated tables, ClickHouse writes the hash sums of the created parts into ClickHouse Keeper. Hash sums are stored only for the most recent `replicated_deduplication_window` blocks. The oldest hash sums are removed from ClickHouse Keeper.
 A large number of `replicated_deduplication_window` slows down `Inserts` because it needs to compare more entries.
 The hash sum is calculated from the composition of the field names and types and the data of the inserted part (stream of bytes).
 
@@ -142,7 +142,7 @@ A deduplication mechanism is used, similar to replicated tables (see [replicated
 
 ## replicated_deduplication_window_seconds {#replicated-deduplication-window-seconds}
 
-The number of seconds after which the hash sums of the inserted blocks are removed from Zookeeper.
+The number of seconds after which the hash sums of the inserted blocks are removed from ClickHouse Keeper.
 
 Possible values:
 
@@ -150,7 +150,7 @@ Possible values:
 
 Default value: 604800 (1 week).
 
-Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash sums of blocks for insert deduplication. Hash sums older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
+Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash sums of blocks for insert deduplication. Hash sums older than `replicated_deduplication_window_seconds` are removed from ClickHouse Keeper, even if they are less than ` replicated_deduplication_window`.
 
 ## replicated_fetches_http_connection_timeout {#replicated_fetches_http_connection_timeout}
 
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 76fbc5f239d..240ba6dea51 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -521,6 +521,18 @@ Result:
 └─────┴────────┘
 ```
 
+## input_format_tsv_skip_first_lines {#settings-input_format_tsv_skip_first_lines}
+
+The number of lines to skip at the beginning of data in TSV input format.
+
+Default value: `0`.
+
+## input_format_csv_skip_first_lines {#settings-input_format_csv_skip_first_lines}
+
+The number of lines to skip at the beginning of data in CSV input format.
+
+Default value: `0`.
+
 ## input_format_null_as_default {#settings-input-format-null-as-default}
 
 Enables or disables the initialization of [NULL](../../sql-reference/syntax.md#null-literal) fields with [default values](../../sql-reference/statements/create/table.md#create-default-values), if data type of these fields is not [nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
@@ -1838,7 +1850,7 @@ Usage
 
 By default, deduplication is not performed for materialized views but is done upstream, in the source table.
 If an INSERTed block is skipped due to deduplication in the source table, there will be no insertion into attached materialized views. This behaviour exists to enable the insertion of highly aggregated data into materialized views, for cases where inserted blocks are the same after materialized view aggregation but derived from different INSERTs into the source table.
-At the same time, this behaviour “breaks” `INSERT` idempotency. If an `INSERT` into the main table was successful and `INSERT` into a materialized view failed (e.g. because of communication failure with Zookeeper) a client will get an error and can retry the operation. However, the materialized view won’t receive the second insert because it will be discarded by deduplication in the main (source) table. The setting `deduplicate_blocks_in_dependent_materialized_views` allows for changing this behaviour. On retry, a materialized view will receive the repeat insert and will perform a deduplication check by itself,
+At the same time, this behaviour “breaks” `INSERT` idempotency. If an `INSERT` into the main table was successful and `INSERT` into a materialized view failed (e.g. because of communication failure with ClickHouse Keeper) a client will get an error and can retry the operation. However, the materialized view won’t receive the second insert because it will be discarded by deduplication in the main (source) table. The setting `deduplicate_blocks_in_dependent_materialized_views` allows for changing this behaviour. On retry, a materialized view will receive the repeat insert and will perform a deduplication check by itself,
 ignoring check result for the source table, and will insert rows lost because of the first failure.
 
 ## insert_deduplication_token {#insert_deduplication_token}
@@ -2459,7 +2471,7 @@ Default value: 0.
 
 ## merge_selecting_sleep_ms {#merge_selecting_sleep_ms}
 
-Sleep time for merge selecting when no part is selected. A lower setting triggers selecting tasks in `background_schedule_pool` frequently, which results in a large number of requests to Zookeeper in large-scale clusters.
+Sleep time for merge selecting when no part is selected. A lower setting triggers selecting tasks in `background_schedule_pool` frequently, which results in a large number of requests to ClickHouse Keeper in large-scale clusters.
 
 Possible values:
 
@@ -2607,7 +2619,7 @@ Default value: 128.
 
 ## background_fetches_pool_size {#background_fetches_pool_size}
 
-Sets the number of threads performing background fetches for [replicated](../../engines/table-engines/mergetree-family/replication.md) tables. This setting is applied at the ClickHouse server start and can’t be changed in a user session. For production usage with frequent small insertions or slow ZooKeeper cluster is recommended to use default value.
+Sets the number of threads performing background fetches for [replicated](../../engines/table-engines/mergetree-family/replication.md) tables. This setting is applied at the ClickHouse server start and can’t be changed in a user session. For production usage with frequent small insertions or slow ZooKeeper cluster it is recommended to use default value.
 
 Possible values:
 
diff --git a/docs/en/operations/system-tables/distributed_ddl_queue.md b/docs/en/operations/system-tables/distributed_ddl_queue.md
index 0597972197d..ac2663bba19 100644
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@@ -15,7 +15,7 @@ Columns:
 -   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query start time.
 -   `query_finish_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Query finish time.
 -   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Duration of query execution (in milliseconds).
--   `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code from [ZooKeeper](../../operations/tips.md#zookeeper).
+-   `exception_code` ([Enum8](../../sql-reference/data-types/enum.md)) — Exception code from [ClickHouse Keeper](../../operations/tips.md#zookeeper).
 
 **Example**
 
diff --git a/docs/en/operations/system-tables/mutations.md b/docs/en/operations/system-tables/mutations.md
index 507146d93de..2878a19a1e7 100644
--- a/docs/en/operations/system-tables/mutations.md
+++ b/docs/en/operations/system-tables/mutations.md
@@ -8,7 +8,7 @@ Columns:
 
 -   `table` ([String](../../sql-reference/data-types/string.md)) — The name of the table to which the mutation was applied.
 
--   `mutation_id` ([String](../../sql-reference/data-types/string.md)) — The ID of the mutation. For replicated tables these IDs correspond to znode names in the `<table_path_in_zookeeper>/mutations/` directory in ZooKeeper. For non-replicated tables the IDs correspond to file names in the data directory of the table.
+-   `mutation_id` ([String](../../sql-reference/data-types/string.md)) — The ID of the mutation. For replicated tables these IDs correspond to znode names in the `<table_path_in_clickhouse_keeper>/mutations/` directory in ClickHouse Keeper. For non-replicated tables the IDs correspond to file names in the data directory of the table.
 
 -   `command` ([String](../../sql-reference/data-types/string.md)) — The mutation command string (the part of the query after `ALTER TABLE [db.]table`).
 
diff --git a/docs/en/operations/system-tables/replicas.md b/docs/en/operations/system-tables/replicas.md
index 6ec0f184e15..c65b0d294b0 100644
--- a/docs/en/operations/system-tables/replicas.md
+++ b/docs/en/operations/system-tables/replicas.md
@@ -62,13 +62,13 @@ Columns:
     Note that writes can be performed to any replica that is available and has a session in ZK, regardless of whether it is a leader.
 -   `can_become_leader` (`UInt8`) - Whether the replica can be a leader.
 -   `is_readonly` (`UInt8`) - Whether the replica is in read-only mode.
-    This mode is turned on if the config does not have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.
--   `is_session_expired` (`UInt8`) - the session with ZooKeeper has expired. Basically the same as `is_readonly`.
+    This mode is turned on if the config does not have sections with ClickHouse Keeper, if an unknown error occurred when reinitializing sessions in ClickHouse Keeper, and during session reinitialization in ClickHouse Keeper.
+-   `is_session_expired` (`UInt8`) - the session with ClickHouse Keeper has expired. Basically the same as `is_readonly`.
 -   `future_parts` (`UInt32`) - The number of data parts that will appear as the result of INSERTs or merges that haven’t been done yet.
 -   `parts_to_check` (`UInt32`) - The number of data parts in the queue for verification. A part is put in the verification queue if there is suspicion that it might be damaged.
--   `zookeeper_path` (`String`) - Path to table data in ZooKeeper.
--   `replica_name` (`String`) - Replica name in ZooKeeper. Different replicas of the same table have different names.
--   `replica_path` (`String`) - Path to replica data in ZooKeeper. The same as concatenating ‘zookeeper_path/replicas/replica_path’.
+-   `zookeeper_path` (`String`) - Path to table data in ClickHouse Keeper.
+-   `replica_name` (`String`) - Replica name in ClickHouse Keeper. Different replicas of the same table have different names.
+-   `replica_path` (`String`) - Path to replica data in ClickHouse Keeper. The same as concatenating ‘zookeeper_path/replicas/replica_path’.
 -   `columns_version` (`Int32`) - Version number of the table structure. Indicates how many times ALTER was performed. If replicas have different versions, it means some replicas haven’t made all of the ALTERs yet.
 -   `queue_size` (`UInt32`) - Size of the queue for operations waiting to be performed. Operations include inserting blocks of data, merges, and certain other actions. It usually coincides with `future_parts`.
 -   `inserts_in_queue` (`UInt32`) - Number of inserts of blocks of data that need to be made. Insertions are usually replicated fairly quickly. If this number is large, it means something is wrong.
@@ -86,12 +86,12 @@ The next 4 columns have a non-zero value only where there is an active session w
 -   `last_queue_update` (`DateTime`) - When the queue was updated last time.
 -   `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
 -   `total_replicas` (`UInt8`) - The total number of known replicas of this table.
--   `active_replicas` (`UInt8`) - The number of replicas of this table that have a session in ZooKeeper (i.e., the number of functioning replicas).
+-   `active_replicas` (`UInt8`) - The number of replicas of this table that have a session in ClickHouse Keeper (i.e., the number of functioning replicas).
 -   `last_queue_update_exception` (`String`) - When the queue contains broken entries. Especially important when ClickHouse breaks backward compatibility between versions and log entries written by newer versions aren't parseable by old versions.
--   `zookeeper_exception` (`String`) - The last exception message, got if the error happened when fetching the info from ZooKeeper. 
+-   `zookeeper_exception` (`String`) - The last exception message, got if the error happened when fetching the info from ClickHouse Keeper. 
 -   `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — Map between replica name and is replica active.
 
-If you request all the columns, the table may work a bit slowly, since several reads from ZooKeeper are made for each row.
+If you request all the columns, the table may work a bit slowly, since several reads from ClickHouse Keeper are made for each row.
 If you do not request the last 4 columns (log_max_index, log_pointer, total_replicas, active_replicas), the table works quickly.
 
 For example, you can check that everything is working correctly like this:
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index a8a51162dae..834f4a04757 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -1,6 +1,6 @@
 # replication_queue {#system_tables-replication_queue}
 
-Contains information about tasks from replication queues stored in ZooKeeper for tables in the `ReplicatedMergeTree` family.
+Contains information about tasks from replication queues stored in Clickhouse Keeper, or ZooKeeper, for tables in the `ReplicatedMergeTree` family.
 
 Columns:
 
@@ -8,11 +8,11 @@ Columns:
 
 -   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
 
--   `replica_name` ([String](../../sql-reference/data-types/string.md)) — Replica name in ZooKeeper. Different replicas of the same table have different names.
+-   `replica_name` ([String](../../sql-reference/data-types/string.md)) — Replica name in ClickHouse Keeper. Different replicas of the same table have different names.
 
 -   `position` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Position of the task in the queue.
 
--   `node_name` ([String](../../sql-reference/data-types/string.md)) — Node name in ZooKeeper.
+-   `node_name` ([String](../../sql-reference/data-types/string.md)) — Node name in ClickHouse Keeper.
 
 -   `type` ([String](../../sql-reference/data-types/string.md)) — Type of the task in the queue, one of:
 
diff --git a/docs/en/operations/system-tables/zookeeper.md b/docs/en/operations/system-tables/zookeeper.md
index e8232483f6f..ec67d2780e3 100644
--- a/docs/en/operations/system-tables/zookeeper.md
+++ b/docs/en/operations/system-tables/zookeeper.md
@@ -1,7 +1,7 @@
 # zookeeper {#system-zookeeper}
 
-The table does not exist if ZooKeeper is not configured. Allows reading data from the ZooKeeper cluster defined in the config.
-The query must either have a ‘path =’   condition or a `path IN`  condition set with the `WHERE` clause as shown below. This corresponds to the path of the children in ZooKeeper that you want to get data for.
+The table does not exist unless ClickHouse Keeper or ZooKeeper is configured. The `system.zookeeper` table exposes data from the Keeper cluster defined in the config.
+The query must either have a ‘path =’   condition or a `path IN`  condition set with the `WHERE` clause as shown below. This corresponds to the path of the children that you want to get data for.
 
 The query `SELECT * FROM system.zookeeper WHERE path = '/clickhouse'` outputs data for all children on the `/clickhouse` node.
 To output data for all root nodes, write path = ‘/’.
@@ -9,7 +9,7 @@ If the path specified in ‘path’ does not exist, an exception will be thrown.
 
 The query `SELECT * FROM system.zookeeper WHERE path IN ('/', '/clickhouse')` outputs data for all children on the `/` and `/clickhouse` node.
 If in the specified ‘path’ collection has does not exist path, an exception will be thrown.
-It can be used to do a batch of ZooKeeper path queries.
+It can be used to do a batch of Keeper path queries.
 
 Columns:
 
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index c727c636579..a0a0391fb09 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -118,17 +118,17 @@ in XML configuration.
 This is important for ClickHouse to be able to get correct information with `cpuid` instruction.
 Otherwise you may get `Illegal instruction` crashes when hypervisor is run on old CPU models.
 
-## ZooKeeper {#zookeeper}
+## ClickHouse Keeper and ZooKeeper {#zookeeper}
 
-You are probably already using ZooKeeper for other purposes. You can use the same installation of ZooKeeper, if it isn’t already overloaded.
+ClickHouse Keeper is recommended to replace ZooKeeper for ClickHouse clusters.  See the documentation for [ClickHouse Keeper](clickhouse-keeper.md)
 
-It’s best to use a fresh version of ZooKeeper – 3.4.9 or later. The version in stable Linux distributions may be outdated.
+If you would like to continue using ZooKeeper then it is best to use a fresh version of ZooKeeper – 3.4.9 or later. The version in stable Linux distributions may be outdated.
 
 You should never use manually written scripts to transfer data between different ZooKeeper clusters, because the result will be incorrect for sequential nodes. Never use the “zkcopy” utility for the same reason: https://github.com/ksprojects/zkcopy/issues/15
 
 If you want to divide an existing ZooKeeper cluster into two, the correct way is to increase the number of its replicas and then reconfigure it as two independent clusters.
 
-Do not run ZooKeeper on the same servers as ClickHouse. Because ZooKeeper is very sensitive for latency and ClickHouse may utilize all available system resources.
+You can run ClickHouse Keeper on the same server as ClickHouse, but do not run ZooKeeper on the same servers as ClickHouse. Because ZooKeeper is very sensitive for latency and ClickHouse may utilize all available system resources.
 
 You can have ZooKeeper observers in an ensemble but ClickHouse servers should not interact with observers.
 
diff --git a/docs/en/operations/utilities/clickhouse-copier.md b/docs/en/operations/utilities/clickhouse-copier.md
index f152c177992..f3806d1afbc 100644
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@@ -11,11 +11,11 @@ Copies data from the tables in one cluster to tables in another (or the same) cl
 To get a consistent copy, the data in the source tables and partitions should not change during the entire process.
 :::
 
-You can run multiple `clickhouse-copier` instances on different servers to perform the same job. ZooKeeper is used for syncing the processes.
+You can run multiple `clickhouse-copier` instances on different servers to perform the same job. ClickHouse Keeper, or ZooKeeper, is used for syncing the processes.
 
 After starting, `clickhouse-copier`:
 
--   Connects to ZooKeeper and receives:
+-   Connects to ClickHouse Keeper and receives:
 
     -   Copying jobs.
     -   The state of the copying jobs.
@@ -24,7 +24,7 @@ After starting, `clickhouse-copier`:
 
     Each running process chooses the “closest” shard of the source cluster and copies the data into the destination cluster, resharding the data if necessary.
 
-`clickhouse-copier` tracks the changes in ZooKeeper and applies them on the fly.
+`clickhouse-copier` tracks the changes in ClickHouse Keeper and applies them on the fly.
 
 To reduce network traffic, we recommend running `clickhouse-copier` on the same server where the source data is located.
 
@@ -33,19 +33,19 @@ To reduce network traffic, we recommend running `clickhouse-copier` on the same
 The utility should be run manually:
 
 ``` bash
-$ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --base-dir /path/to/dir
+$ clickhouse-copier --daemon --config keeper.xml --task-path /task/path --base-dir /path/to/dir
 ```
 
 Parameters:
 
 -   `daemon` — Starts `clickhouse-copier` in daemon mode.
--   `config` — The path to the `zookeeper.xml` file with the parameters for the connection to ZooKeeper.
--   `task-path` — The path to the ZooKeeper node. This node is used for syncing `clickhouse-copier` processes and storing tasks. Tasks are stored in `$task-path/description`.
--   `task-file` — Optional path to file with task configuration for initial upload to ZooKeeper.
+-   `config` — The path to the `keeper.xml` file with the parameters for the connection to ClickHouse Keeper.
+-   `task-path` — The path to the ClickHouse Keeper node. This node is used for syncing `clickhouse-copier` processes and storing tasks. Tasks are stored in `$task-path/description`.
+-   `task-file` — Optional path to file with task configuration for initial upload to ClickHouse Keeper.
 -   `task-upload-force` — Force upload `task-file` even if node already exists.
 -   `base-dir` — The path to logs and auxiliary files. When it starts, `clickhouse-copier` creates `clickhouse-copier_YYYYMMHHSS_<PID>` subdirectories in `$base-dir`. If this parameter is omitted, the directories are created in the directory where `clickhouse-copier` was launched.
 
-## Format of Zookeeper.xml {#format-of-zookeeper-xml}
+## Format of keeper.xml {#format-of-zookeeper-xml}
 
 ``` xml
 <clickhouse>
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index bd88a8b09f7..cf95c83a154 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -21,7 +21,7 @@ ClickHouse generates an exception for errors with dictionaries. Examples of erro
 -   The dictionary being accessed could not be loaded.
 -   Error querying a `cached` dictionary.
 
-You can view the list of external dictionaries and their statuses in the `system.dictionaries` table.
+You can view the list of external dictionaries and their statuses in the [system.dictionaries](../../../operations/system-tables/dictionaries.md) table.
 
 The configuration looks like this:
 
@@ -48,6 +48,35 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 ...
 ```
 
+Dictionaries without word `complex-key*` in a layout have a key with [UInt64](../../../sql-reference/data-types/int-uint.md) type, `complex-key*` dictionaries have a composite key (complex, with arbitrary types).
+
+[UInt64](../../../sql-reference/data-types/int-uint.md) keys in XML dictionaries are defined with `<id>` tag.
+
+Configuration example (column key_column has UInt64 type):
+```xml
+...
+<structure>
+    <id>
+        <name>key_column</name>
+    </id>
+...
+```
+
+Composite `complex` keys XML dictionaries are defined `<key>` tag.
+
+Configuration example of a composite key (key has one element with [String](../../../sql-reference/data-types/string.md) type):
+```xml
+...
+<structure>
+    <key>
+        <attribute>
+            <name>country_code</name>
+            <type>String</type>
+        </attribute>
+    </key>
+...
+```
+
 ## Ways to Store Dictionaries in Memory {#ways-to-store-dictionaries-in-memory}
 
 -   [flat](#flat)
@@ -98,6 +127,8 @@ LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
 
 The dictionary is completely stored in memory in the form of a hash table. The dictionary can contain any number of elements with any identifiers In practice, the number of keys can reach tens of millions of items.
 
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
+
 If `preallocate` is `true` (default is `false`) the hash table will be preallocated (this will make the dictionary load faster). But note that you should use it only if:
 
 - The source support an approximate number of elements (for now it is supported only by the `ClickHouse` source).
@@ -125,6 +156,8 @@ LAYOUT(HASHED(PREALLOCATE 0))
 
 Similar to `hashed`, but uses less memory in favor more CPU usage.
 
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
+
 It will be also preallocated so as `hashed` (with `preallocate` set to `true`), and note that it is even more significant for `sparse_hashed`.
 
 Configuration example:
@@ -181,6 +214,8 @@ LAYOUT(COMPLEX_KEY_SPARSE_HASHED())
 
 The dictionary is completely stored in memory. Each attribute is stored in an array. The key attribute is stored in the form of a hashed table where value is an index in the attributes array. The dictionary can contain any number of elements with any identifiers. In practice, the number of keys can reach tens of millions of items.
 
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
+
 All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
 
 Configuration example:
@@ -220,6 +255,7 @@ LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
 
 The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values.
 
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
 This storage method works the same way as hashed and allows using date/time (arbitrary numeric type) ranges in addition to the key.
 
 Example: The table contains discounts for each advertiser in the format:
@@ -360,6 +396,8 @@ RANGE(MIN StartDate MAX EndDate);
 
 The dictionary is stored in a cache that has a fixed number of cells. These cells contain frequently used elements.
 
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
+
 When searching for a dictionary, the cache is searched first. For each block of data, all keys that are not found in the cache or are outdated are requested from the source using `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. The received data is then written to the cache.
 
 If keys are not found in dictionary, then update cache task is created and added into update queue. Update queue properties can be controlled with settings `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds`, `max_threads_for_updates`.
@@ -420,6 +458,8 @@ This type of storage is for use with composite [keys](../../../sql-reference/dic
 
 Similar to `cache`, but stores data on SSD and index in RAM. All cache dictionary settings related to update queue can also be applied to SSD cache dictionaries.
 
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
+
 ``` xml
 <layout>
     <ssd_cache>
@@ -452,7 +492,7 @@ This type of storage is for use with composite [keys](../../../sql-reference/dic
 
 The dictionary is not stored in memory and directly goes to the source during the processing of a request.
 
-The dictionary key has the `UInt64` type.
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type.
 
 All types of [sources](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md), except local files, are supported.
 
diff --git a/docs/en/sql-reference/functions/geo/h3.md b/docs/en/sql-reference/functions/geo/h3.md
index f4d199e6729..25f668de245 100644
--- a/docs/en/sql-reference/functions/geo/h3.md
+++ b/docs/en/sql-reference/functions/geo/h3.md
@@ -1141,4 +1141,261 @@ Result:
 │ [590080815153545215,590080471556161535,590080677714591743,590077585338138623,590077447899185151,590079509483487231] │
 └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
-[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/h3) <!--hide-->
+
+## h3GetUnidirectionalEdge {#h3getunidirectionaledge}
+
+Returns a unidirectional edge H3 index based on the provided origin and destination and returns 0 on error.
+
+**Syntax**
+
+``` sql
+h3GetUnidirectionalEdge(originIndex, destinationIndex)
+```
+
+**Parameter**
+
+-   `originIndex` — Origin Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `destinationIndex` — Destination Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Unidirectional Edge Hexagon Index number.
+
+Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3GetUnidirectionalEdge(599686042433355775, 599686043507097599) as edge;
+```
+
+Result:
+
+``` text
+┌────────────────edge─┐
+│ 1248204388774707199 │
+└─────────────────────┘
+```
+
+## h3UnidirectionalEdgeIsValid {#h3unidirectionaledgeisvalid}
+
+Determines if the provided H3Index is a valid unidirectional edge index. Returns 1 if it's a unidirectional edge and 0 otherwise.
+
+**Syntax**
+
+``` sql
+h3UnidirectionalEdgeisValid(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   1 — The H3 index is a valid unidirectional edge.
+-   0 — The H3 index is not a valid unidirectional edge.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3UnidirectionalEdgeIsValid(1248204388774707199) as validOrNot;
+```
+
+Result:
+
+``` text
+┌─validOrNot─┐
+│          1 │
+└────────────┘
+```
+
+## h3GetOriginIndexFromUnidirectionalEdge {#h3getoriginindexfromunidirectionaledge}
+
+Returns the origin hexagon index from the unidirectional edge H3Index.
+
+**Syntax**
+
+``` sql
+h3GetOriginIndexFromUnidirectionalEdge(edge)
+```
+
+**Parameter**
+
+-   `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Origin Hexagon Index number.
+
+Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3GetOriginIndexFromUnidirectionalEdge(1248204388774707197) as origin;
+```
+
+Result:
+
+``` text
+┌─────────────origin─┐
+│ 599686042433355773 │
+└────────────────────┘
+```
+
+## h3GetDestinationIndexFromUnidirectionalEdge {#h3getdestinationindexfromunidirectionaledge}
+
+Returns the destination hexagon index from the unidirectional edge H3Index.
+
+**Syntax**
+
+``` sql
+h3GetDestinationIndexFromUnidirectionalEdge(edge)
+```
+
+**Parameter**
+
+-   `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-  Destination Hexagon Index number.
+
+Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3GetDestinationIndexFromUnidirectionalEdge(1248204388774707197) as destination;
+```
+
+Result:
+
+``` text
+┌────────destination─┐
+│ 599686043507097597 │
+└────────────────────┘
+```
+
+## h3GetIndexesFromUnidirectionalEdge {#h3getindexesfromunidirectionaledge}
+
+Returns the origin and destination hexagon indexes from the given unidirectional edge H3Index.
+
+**Syntax**
+
+``` sql
+h3GetIndexesFromUnidirectionalEdge(edge)
+```
+
+**Parameter**
+
+-   `edge` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+A tuple consisting of two values `tuple(origin,destination)`:
+
+- `origin` — Origin Hexagon index number. [UInt64](../../../sql-reference/data-types/int-uint.md).
+- `destination` — Destination Hexagon index number. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+Returns `(0,0)` if the provided input is not valid.
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3GetIndexesFromUnidirectionalEdge(1248204388774707199) as indexes;
+```
+
+Result:
+
+``` text
+┌─indexes─────────────────────────────────┐
+│ (599686042433355775,599686043507097599) │
+└─────────────────────────────────────────┘
+```
+
+## h3GetUnidirectionalEdgesFromHexagon {#h3getunidirectionaledgesfromhexagon}
+
+Provides all of the unidirectional edges from the provided H3Index.
+
+**Syntax**
+
+``` sql
+h3GetUnidirectionalEdgesFromHexagon(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+Array of h3 indexes representing each unidirectional edge:
+
+Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3GetUnidirectionalEdgesFromHexagon(1248204388774707199) as edges;
+```
+
+Result:
+
+``` text
+┌─edges─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ [1248204388774707199,1320261982812635135,1392319576850563071,1464377170888491007,1536434764926418943,1608492358964346879] │
+└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## h3GetUnidirectionalEdgeBoundary {#h3getunidirectionaledgeboundary}
+
+Returns the coordinates defining the unidirectional edge.
+
+**Syntax**
+
+``` sql
+h3GetUnidirectionalEdgeBoundary(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number that represents a unidirectional edge. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-    Array of pairs '(lon, lat)'.
+     Type: [Array](../../../sql-reference/data-types/array.md)([Float64](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md)).
+
+
+**Example**
+
+Query:
+
+``` sql
+ SELECT h3GetUnidirectionalEdgeBoundary(1248204388774707199) as boundary;
+```
+
+Result:
+
+``` text
+┌─boundary────────────────────────────────────────────────────────────────────────┐
+│ [(37.42012867767779,-122.03773496427027),(37.33755608435299,-122.090428929044)] │
+└─────────────────────────────────────────────────────────────────────────────────┘
+```
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/h3) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/development/contrib.md b/docs/ru/development/contrib.md
index b98ed847a0b..1b99ec97553 100644
--- a/docs/ru/development/contrib.md
+++ b/docs/ru/development/contrib.md
@@ -92,7 +92,7 @@ sidebar_label: "Используемые сторонние библиотеки
 SELECT library_name, license_type, license_path FROM system.licenses ORDER BY library_name COLLATE 'en';
 ```
 
-[Пример](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
+[Пример](https://play.clickhouse.com/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
 
 ## Рекомендации по добавлению сторонних библиотек и поддержанию в них пользовательских изменений {#adding-third-party-libraries}
 
diff --git a/docs/ru/getting-started/example-datasets/brown-benchmark.md b/docs/ru/getting-started/example-datasets/brown-benchmark.md
index 8d2605f4a9f..8afda860b72 100644
--- a/docs/ru/getting-started/example-datasets/brown-benchmark.md
+++ b/docs/ru/getting-started/example-datasets/brown-benchmark.md
@@ -411,5 +411,4 @@ ORDER BY yr,
          mo;
 ```
 
-Данные также доступны для работы с интерактивными запросами через [Playground](https://gh-api.clickhouse.com/play?user=play), [пример](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
-
+Данные также доступны для работы с интерактивными запросами через [Playground](https://play.clickhouse.com/play?user=play), [пример](https://play.clickhouse.com/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
diff --git a/docs/ru/getting-started/example-datasets/cell-towers.md b/docs/ru/getting-started/example-datasets/cell-towers.md
index 254d53ad7e1..49174994c14 100644
--- a/docs/ru/getting-started/example-datasets/cell-towers.md
+++ b/docs/ru/getting-started/example-datasets/cell-towers.md
@@ -125,4 +125,4 @@ SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM
 1 rows in set. Elapsed: 0.067 sec. Processed 43.28 million rows, 692.42 MB (645.83 million rows/s., 10.33 GB/s.)
 ```
 
-Вы можете протестировать другие запросы с помощью интерактивного ресурса [Playground](https://gh-api.clickhouse.com/play?user=play). Например, [вот так](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=). Однако, обратите внимание, что здесь нельзя создавать временные таблицы.
+Вы можете протестировать другие запросы с помощью интерактивного ресурса [Playground](https://play.clickhouse.com/play?user=play). Например, [вот так](https://play.clickhouse.com/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=). Однако, обратите внимание, что здесь нельзя создавать временные таблицы.
diff --git a/docs/ru/getting-started/example-datasets/recipes.md b/docs/ru/getting-started/example-datasets/recipes.md
index 08838f1c950..f3b4c8285d7 100644
--- a/docs/ru/getting-started/example-datasets/recipes.md
+++ b/docs/ru/getting-started/example-datasets/recipes.md
@@ -337,6 +337,6 @@ WHERE title = 'Chocolate-Strawberry-Orange Wedding Cake';
 
 ### Online Playground
 
-Этот набор данных доступен в [Online Playground](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+Этот набор данных доступен в [Online Playground](https://play.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
 
 [Оригинальная статья](https://clickhouse.com/docs/ru/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index 12628bb2df1..35c8cc0842a 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -21,7 +21,7 @@ sidebar_label: "Хранение словарей в памяти"
 -   При обращении к словарю, который не удалось загрузить.
 -   При ошибке запроса к `cached`-словарю.
 
-Список внешних словарей и их статус можно посмотреть в таблице `system.dictionaries`.
+Список внешних словарей и их статус можно посмотреть в таблице [system.dictionaries](../../../operations/system-tables/dictionaries.md).
 
 Общий вид конфигурации:
 
@@ -48,6 +48,36 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 ...
 ```
 
+Ключ словарей не имеющих слово `complex-key*` в названии имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md), `complex-key*` словари позволяют произвольный тип ключа (составной, и из разных типов).
+
+[UInt64](../../../sql-reference/data-types/int-uint.md) ключи в XML словарях задаются тегом `<id>`.
+
+Пример конфигурации (поле key_column имеет тип UInt64):
+```xml
+...
+<structure>
+    <id>
+        <name>key_column</name>
+    </id>
+...
+```
+
+Cоставные `complex` ключи в XML словарях задаются тегом `<key>`.
+
+Пример конфигурации составного ключа (ключ состоит из одного элемента с типом [String](../../../sql-reference/data-types/string.md)):
+```xml
+...
+<structure>
+    <key>
+        <attribute>
+            <name>country_code</name>
+            <type>String</type>
+        </attribute>
+    </key>
+...
+```
+
+
 ## Способы размещения словарей в памяти {#ways-to-store-dictionaries-in-memory}
 
 -   [flat](#flat)
@@ -98,6 +128,8 @@ LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
 
 Словарь полностью хранится в оперативной памяти в виде хэш-таблиц. Словарь может содержать произвольное количество элементов с произвольными идентификаторами. На практике количество ключей может достигать десятков миллионов элементов.
 
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
+
 Если `preallocate` имеет значение `true` (по умолчанию `false`), хеш-таблица будет предварительно определена (это ускорит загрузку словаря). Используйте этот метод только в случае, если:
 
 - Источник поддерживает произвольное количество элементов (пока поддерживается только источником `ClickHouse`).
@@ -125,6 +157,8 @@ LAYOUT(HASHED(PREALLOCATE 0))
 
 Аналогичен `hashed`, но при этом занимает меньше места в памяти и генерирует более высокую загрузку CPU.
 
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
+
 Для этого типа размещения также можно задать `preallocate` в значении `true`. В данном случае это более важно, чем для типа `hashed`.
 
 Пример конфигурации:
@@ -181,6 +215,8 @@ LAYOUT(COMPLEX_KEY_SPARSE_HASHED())
 
 Словарь полностью хранится в оперативной памяти. Каждый атрибут хранится в массиве. Ключевой атрибут хранится в виде хеш-таблицы, где его значение является индексом в массиве атрибутов. Словарь может содержать произвольное количество элементов с произвольными идентификаторами. На практике количество ключей может достигать десятков миллионов элементов.
 
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
+
 Поддерживаются все виды источников. При обновлении данные (из файла, из таблицы) считываются целиком.
 
 Пример конфигурации:
@@ -220,6 +256,7 @@ LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
 
 Словарь хранится в оперативной памяти в виде хэш-таблицы с упорядоченным массивом диапазонов и соответствующих им значений.
 
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
 Этот способ размещения работает также как и hashed и позволяет дополнительно к ключу использовать дипазоны по дате/времени (произвольному числовому типу).
 
 Пример: таблица содержит скидки для каждого рекламодателя в виде:
@@ -355,6 +392,8 @@ RANGE(MIN StartDate MAX EndDate);
 
 Словарь хранится в кэше, состоящем из фиксированного количества ячеек. Ячейки содержат часто используемые элементы.
 
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
+
 При поиске в словаре сначала просматривается кэш. На каждый блок данных, все не найденные в кэше или устаревшие ключи запрашиваются у источника с помощью `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. Затем, полученные данные записываются в кэш.
 
 Если ключи не были найдены в словаре, то для обновления кэша создается задание и добавляется в очередь обновлений. Параметры очереди обновлений можно устанавливать настройками `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds`, `max_threads_for_updates`
@@ -414,6 +453,8 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
 
 Похож на `cache`, но хранит данные на SSD, а индекс в оперативной памяти. Все параметры, относящиеся к очереди обновлений, могут также быть применены к SSD-кэш словарям.
 
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
+
 ``` xml
 <layout>
     <ssd_cache>
@@ -446,7 +487,7 @@ LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
 
 Словарь не хранит данные локально и взаимодействует с источником непосредственно в момент запроса.
 
-Ключ словаря имеет тип `UInt64`.
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 Поддерживаются все виды [источников](external-dicts-dict-sources.md), кроме локальных файлов.
 
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index ad59ec20e39..3e7a49515c6 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -62,6 +62,8 @@ option (ENABLE_CLICKHOUSE_KEEPER "ClickHouse alternative to ZooKeeper" ${ENABLE_
 
 option (ENABLE_CLICKHOUSE_KEEPER_CONVERTER "Util allows to convert ZooKeeper logs and snapshots into clickhouse-keeper snapshot" ${ENABLE_CLICKHOUSE_ALL})
 
+option (ENABLE_CLICKHOUSE_SU "A tool similar to 'su'" ${ENABLE_CLICKHOUSE_ALL})
+
 if (NOT ENABLE_NURAFT)
     # RECONFIGURE_MESSAGE_LEVEL should not be used here,
     # since ENABLE_NURAFT is set to OFF for FreeBSD and Darwin.
@@ -237,6 +239,7 @@ add_subdirectory (install)
 add_subdirectory (git-import)
 add_subdirectory (bash-completion)
 add_subdirectory (static-files-disk-uploader)
+add_subdirectory (su)
 
 if (ENABLE_CLICKHOUSE_KEEPER)
     add_subdirectory (keeper)
@@ -269,7 +272,8 @@ if (CLICKHOUSE_ONE_SHARED)
     ${CLICKHOUSE_ODBC_BRIDGE_SOURCES}
     ${CLICKHOUSE_KEEPER_SOURCES}
     ${CLICKHOUSE_KEEPER_CONVERTER_SOURCES}
-    ${CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_SOURCES})
+    ${CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_SOURCES}
+    ${CLICKHOUSE_SU_SOURCES})
 
     target_link_libraries(clickhouse-lib
       ${CLICKHOUSE_SERVER_LINK}
@@ -285,7 +289,8 @@ if (CLICKHOUSE_ONE_SHARED)
       ${CLICKHOUSE_ODBC_BRIDGE_LINK}
       ${CLICKHOUSE_KEEPER_LINK}
       ${CLICKHOUSE_KEEPER_CONVERTER_LINK}
-      ${CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_LINK})
+      ${CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_LINK}
+      ${CLICKHOUSE_SU_LINK})
 
     target_include_directories(clickhouse-lib
       ${CLICKHOUSE_SERVER_INCLUDE}
@@ -318,8 +323,7 @@ if (CLICKHOUSE_SPLIT_BINARY)
         clickhouse-obfuscator
         clickhouse-git-import
         clickhouse-copier
-        clickhouse-static-files-disk-uploader
-    )
+        clickhouse-static-files-disk-uploader)
 
     if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
         list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-odbc-bridge)
@@ -387,6 +391,9 @@ else ()
     if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
         clickhouse_target_link_split_lib(clickhouse static-files-disk-uploader)
     endif ()
+    if (ENABLE_CLICKHOUSE_SU)
+        clickhouse_target_link_split_lib(clickhouse su)
+    endif ()
     if (ENABLE_CLICKHOUSE_KEEPER)
         clickhouse_target_link_split_lib(clickhouse keeper)
     endif()
@@ -453,6 +460,11 @@ else ()
         install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-static-files-disk-uploader" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-static-files-disk-uploader)
     endif ()
+    if (ENABLE_CLICKHOUSE_SU)
+        add_custom_target (clickhouse-su ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-su DEPENDS clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-su" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-su)
+    endif ()
 
     if (ENABLE_CLICKHOUSE_KEEPER)
         if (NOT BUILD_STANDALONE_KEEPER AND CREATE_KEEPER_SYMLINK)
diff --git a/programs/config_tools.h.in b/programs/config_tools.h.in
index b97eb63b535..aafe3ae8701 100644
--- a/programs/config_tools.h.in
+++ b/programs/config_tools.h.in
@@ -19,3 +19,4 @@
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER_CONVERTER
 #cmakedefine01 ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
+#cmakedefine01 ENABLE_CLICKHOUSE_SU
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 1d30b541ca0..33b4e687f85 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -925,24 +925,7 @@ namespace
             executable.string(), config.string(), pid_file.string());
 
         if (!user.empty())
-        {
-#if defined(OS_FREEBSD)
-            command = fmt::format("su -m '{}' -c '{}'", user, command);
-#else
-            bool may_need_sudo = geteuid() != 0;
-            if (may_need_sudo)
-            {
-                struct passwd *p = getpwuid(geteuid());
-                // Only use sudo when we are not the given user
-                if (p == nullptr || std::string(p->pw_name) != user)
-                    command = fmt::format("sudo -u '{}' {}", user, command);
-            }
-            else
-            {
-                command = fmt::format("su -s /bin/sh '{}' -c '{}'", user, command);
-            }
-#endif
-        }
+            command = fmt::format("clickhouse su '{}' {}", user, command);
 
         fmt::print("Will run {}\n", command);
         executeScript(command, true);
diff --git a/programs/main.cpp b/programs/main.cpp
index e47fdcb40c8..e505246a908 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -65,6 +65,9 @@ int mainEntryClickHouseKeeperConverter(int argc, char ** argv);
 #if ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
 int mainEntryClickHouseStaticFilesDiskUploader(int argc, char ** argv);
 #endif
+#if ENABLE_CLICKHOUSE_SU
+int mainEntryClickHouseSU(int argc, char ** argv);
+#endif
 #if ENABLE_CLICKHOUSE_INSTALL
 int mainEntryClickHouseInstall(int argc, char ** argv);
 int mainEntryClickHouseStart(int argc, char ** argv);
@@ -81,8 +84,6 @@ int mainEntryClickHouseHashBinary(int, char **)
     return 0;
 }
 
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
 namespace
 {
 
@@ -138,6 +139,9 @@ std::pair<const char *, MainFunc> clickhouse_applications[] =
 #endif
 #if ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
     {"static-files-disk-uploader", mainEntryClickHouseStaticFilesDiskUploader},
+#endif
+#if ENABLE_CLICKHOUSE_SU
+    {"su", mainEntryClickHouseSU},
 #endif
     {"hash-binary", mainEntryClickHouseHashBinary},
 };
@@ -189,7 +193,7 @@ auto instructionFailToString(InstructionFail fail)
 {
     switch (fail)
     {
-#define ret(x) return std::make_tuple(STDERR_FILENO, x, ARRAY_SIZE(x) - 1)
+#define ret(x) return std::make_tuple(STDERR_FILENO, x, sizeof(x) - 1)
         case InstructionFail::NONE:
             ret("NONE");
         case InstructionFail::SSE3:
@@ -277,7 +281,7 @@ void checkRequiredInstructionsImpl(volatile InstructionFail & fail)
 #define writeError(data) do \
     { \
         static_assert(__builtin_constant_p(data)); \
-        if (!writeRetry(STDERR_FILENO, data, ARRAY_SIZE(data) - 1)) \
+        if (!writeRetry(STDERR_FILENO, data, sizeof(data) - 1)) \
             _Exit(1); \
     } while (false)
 
@@ -334,6 +338,7 @@ struct Checker
 #endif
 ;
 
+
 /// NOTE: We will migrate to full static linking or our own dynamic loader to make this code obsolete.
 void checkHarmfulEnvironmentVariables(char ** argv)
 {
@@ -406,17 +411,17 @@ int main(int argc_, char ** argv_)
     inside_main = true;
     SCOPE_EXIT({ inside_main = false; });
 
+    /// PHDR cache is required for query profiler to work reliably
+    /// It also speed up exception handling, but exceptions from dynamically loaded libraries (dlopen)
+    ///  will work only after additional call of this function.
+    updatePHDRCache();
+
     checkHarmfulEnvironmentVariables(argv_);
 
     /// Reset new handler to default (that throws std::bad_alloc)
     /// It is needed because LLVM library clobbers it.
     std::set_new_handler(nullptr);
 
-    /// PHDR cache is required for query profiler to work reliably
-    /// It also speed up exception handling, but exceptions from dynamically loaded libraries (dlopen)
-    ///  will work only after additional call of this function.
-    updatePHDRCache();
-
     std::vector<char *> argv(argv_, argv_ + argc_);
 
     /// Print a basic help if nothing was matched
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 4a964b81694..311a9c284da 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -546,8 +546,9 @@ static void sanityChecks(Server & server)
 #if defined(OS_LINUX)
     try
     {
-        if (readString("/sys/devices/system/clocksource/clocksource0/current_clocksource").find("tsc") == std::string::npos)
-            server.context()->addWarningMessage("Linux is not using a fast TSC clock source. Performance can be degraded.");
+        const char * filename = "/sys/devices/system/clocksource/clocksource0/current_clocksource";
+        if (readString(filename).find("tsc") == std::string::npos)
+            server.context()->addWarningMessage("Linux is not using a fast TSC clock source. Performance can be degraded. Check " + String(filename));
     }
     catch (...)
     {
@@ -555,8 +556,9 @@ static void sanityChecks(Server & server)
 
     try
     {
-        if (readNumber("/proc/sys/vm/overcommit_memory") == 2)
-            server.context()->addWarningMessage("Linux memory overcommit is disabled.");
+        const char * filename = "/proc/sys/vm/overcommit_memory";
+        if (readNumber(filename) == 2)
+            server.context()->addWarningMessage("Linux memory overcommit is disabled. Check " + String(filename));
     }
     catch (...)
     {
@@ -564,8 +566,9 @@ static void sanityChecks(Server & server)
 
     try
     {
-        if (readString("/sys/kernel/mm/transparent_hugepage/enabled").find("[always]") != std::string::npos)
-            server.context()->addWarningMessage("Linux transparent hugepages are set to \"always\".");
+        const char * filename = "/sys/kernel/mm/transparent_hugepage/enabled";
+        if (readString(filename).find("[always]") != std::string::npos)
+            server.context()->addWarningMessage("Linux transparent hugepages are set to \"always\". Check " + String(filename));
     }
     catch (...)
     {
@@ -573,8 +576,9 @@ static void sanityChecks(Server & server)
 
     try
     {
-        if (readNumber("/proc/sys/kernel/pid_max") < 30000)
-            server.context()->addWarningMessage("Linux max PID is too low.");
+        const char * filename = "/proc/sys/kernel/pid_max";
+        if (readNumber(filename) < 30000)
+            server.context()->addWarningMessage("Linux max PID is too low. Check " + String(filename));
     }
     catch (...)
     {
@@ -582,8 +586,9 @@ static void sanityChecks(Server & server)
 
     try
     {
-        if (readNumber("/proc/sys/kernel/threads-max") < 30000)
-            server.context()->addWarningMessage("Linux threads max count is too low.");
+        const char * filename = "/proc/sys/kernel/threads-max";
+        if (readNumber(filename) < 30000)
+            server.context()->addWarningMessage("Linux threads max count is too low. Check " + String(filename));
     }
     catch (...)
     {
@@ -591,7 +596,7 @@ static void sanityChecks(Server & server)
 
     std::string dev_id = getBlockDeviceId(data_path);
     if (getBlockDeviceType(dev_id) == BlockDeviceType::ROT && getBlockDeviceReadAheadBytes(dev_id) == 0)
-        server.context()->addWarningMessage("Rotational disk with disabled readahead is in use. Performance can be degraded.");
+        server.context()->addWarningMessage("Rotational disk with disabled readahead is in use. Performance can be degraded. Used for data: " + String(data_path));
 #endif
 
     try
@@ -1395,8 +1400,11 @@ int Server::main(const std::vector<std::string> & /*args*/)
     fs::create_directories(format_schema_path);
 
     /// Check sanity of MergeTreeSettings on server startup
-    global_context->getMergeTreeSettings().sanityCheck(settings);
-    global_context->getReplicatedMergeTreeSettings().sanityCheck(settings);
+    {
+        size_t background_pool_tasks = global_context->getMergeMutateExecutor()->getMaxTasksCount();
+        global_context->getMergeTreeSettings().sanityCheck(background_pool_tasks);
+        global_context->getReplicatedMergeTreeSettings().sanityCheck(background_pool_tasks);
+    }
 
     /// try set up encryption. There are some errors in config, error will be printed and server wouldn't start.
     CompressionCodecEncrypted::Configuration::instance().load(config(), "encryption_codecs");
diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index a10c25c3342..07c066b0d59 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -200,6 +200,6 @@ try
 }
 catch (...)
 {
-    std::cerr << DB::getCurrentExceptionMessage(false);
+    std::cerr << DB::getCurrentExceptionMessage(false) << '\n';
     return 1;
 }
diff --git a/programs/su/CMakeLists.txt b/programs/su/CMakeLists.txt
new file mode 100644
index 00000000000..df207e16f6e
--- /dev/null
+++ b/programs/su/CMakeLists.txt
@@ -0,0 +1,3 @@
+set (CLICKHOUSE_SU_SOURCES clickhouse-su.cpp)
+set (CLICKHOUSE_SU_LINK PRIVATE dbms)
+clickhouse_program_add(su)
diff --git a/programs/su/clickhouse-su.cpp b/programs/su/clickhouse-su.cpp
new file mode 100644
index 00000000000..9aa41085094
--- /dev/null
+++ b/programs/su/clickhouse-su.cpp
@@ -0,0 +1,145 @@
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
+#include <fmt/format.h>
+#include <vector>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+
+
+/// "su" means "set user"
+/// In fact, this program can set Unix user and group.
+///
+/// Usage:
+/// clickhouse su user[:group] args...
+///
+/// - will set user and, optionally, group and exec the remaining args.
+///   user and group can be numeric identifiers or strings.
+///
+/// The motivation for this tool is very obscure and idiosyncratic. It is needed for Docker.
+/// People want to run programs inside Docker with dropped privileges (less than root).
+/// But the standard Linux "su" program is not suitable for usage inside Docker,
+/// because it is creating pseudoterminals to avoid hijacking input from the terminal, for security,
+/// but Docker is also doing something with the terminal and it is incompatible.
+/// For this reason, people use alternative and less "secure" versions of "su" tools like "gosu" or "su-exec".
+/// But it would be very strange to use 3rd-party software only to do two-three syscalls.
+/// That's why we provide this tool.
+///
+/// Note: ClickHouse does not need Docker at all and works better without Docker.
+/// ClickHouse has no dependencies, it is packaged and distributed in single binary.
+/// There is no reason to use Docker unless you are already running all your software in Docker.
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int SYSTEM_ERROR;
+}
+
+void setUserAndGroup(std::string arg_uid, std::string arg_gid)
+{
+    static constexpr size_t buf_size = 16384; /// Linux man page says it is enough. Nevertheless, we will check if it's not enough and throw.
+    std::unique_ptr<char[]> buf(new char[buf_size]);
+
+    /// Set the group first, because if we set user, the privileges will be already dropped and we will not be able to set the group later.
+
+    if (!arg_gid.empty())
+    {
+        gid_t gid = 0;
+        if (!tryParse(gid, arg_gid) || gid == 0)
+        {
+            group entry{};
+            group * result{};
+
+            if (0 != getgrnam_r(arg_gid.data(), &entry, buf.get(), buf_size, &result))
+                throwFromErrno(fmt::format("Cannot do 'getgrnam_r' to obtain gid from group name ({})", arg_gid), ErrorCodes::SYSTEM_ERROR);
+
+            if (!result)
+                throw Exception("Group {} is not found in the system", ErrorCodes::BAD_ARGUMENTS);
+
+            gid = entry.gr_gid;
+        }
+
+        if (gid == 0 && getgid() != 0)
+            throw Exception("Group has id 0, but dropping privileges to gid 0 does not make sense", ErrorCodes::BAD_ARGUMENTS);
+
+        if (0 != setgid(gid))
+            throwFromErrno(fmt::format("Cannot do 'setgid' to user ({})", arg_gid), ErrorCodes::SYSTEM_ERROR);
+    }
+
+    if (!arg_uid.empty())
+    {
+        /// Is it numeric id or name?
+        uid_t uid = 0;
+        if (!tryParse(uid, arg_uid) || uid == 0)
+        {
+            passwd entry{};
+            passwd * result{};
+
+            if (0 != getpwnam_r(arg_uid.data(), &entry, buf.get(), buf_size, &result))
+                throwFromErrno(fmt::format("Cannot do 'getpwnam_r' to obtain uid from user name ({})", arg_uid), ErrorCodes::SYSTEM_ERROR);
+
+            if (!result)
+                throw Exception("User {} is not found in the system", ErrorCodes::BAD_ARGUMENTS);
+
+            uid = entry.pw_uid;
+        }
+
+        if (uid == 0 && getuid() != 0)
+            throw Exception("User has id 0, but dropping privileges to uid 0 does not make sense", ErrorCodes::BAD_ARGUMENTS);
+
+        if (0 != setuid(uid))
+            throwFromErrno(fmt::format("Cannot do 'setuid' to user ({})", arg_uid), ErrorCodes::SYSTEM_ERROR);
+    }
+}
+
+}
+
+
+int mainEntryClickHouseSU(int argc, char ** argv)
+try
+{
+    using namespace DB;
+
+    if (argc < 3)
+    {
+        std::cout << "Usage: ./clickhouse su user:group ..." << std::endl;
+        exit(0);
+    }
+
+    std::string_view user_and_group = argv[1];
+
+    std::string user;
+    std::string group;
+
+    auto pos = user_and_group.find(':');
+    if (pos == std::string_view::npos)
+    {
+        user = user_and_group;
+    }
+    else
+    {
+        user = user_and_group.substr(0, pos);
+        group = user_and_group.substr(pos + 1);
+    }
+
+    setUserAndGroup(std::move(user), std::move(group));
+
+    std::vector<char *> new_argv;
+    new_argv.reserve(argc - 1);
+    new_argv.insert(new_argv.begin(), argv + 2, argv + argc);
+    new_argv.push_back(nullptr);
+
+    execvp(new_argv.front(), new_argv.data());
+
+    throwFromErrno("Cannot execvp", ErrorCodes::SYSTEM_ERROR);
+}
+catch (...)
+{
+    std::cerr << DB::getCurrentExceptionMessage(false) << '\n';
+    return 1;
+}
diff --git a/src/Access/Common/AccessType.h b/src/Access/Common/AccessType.h
index 8c10fd7e150..d5233951403 100644
--- a/src/Access/Common/AccessType.h
+++ b/src/Access/Common/AccessType.h
@@ -159,6 +159,7 @@ enum class AccessType
     M(SYSTEM_RESTART_REPLICA, "RESTART REPLICA", TABLE, SYSTEM) \
     M(SYSTEM_RESTORE_REPLICA, "RESTORE REPLICA", TABLE, SYSTEM) \
     M(SYSTEM_SYNC_DATABASE_REPLICA, "SYNC DATABASE REPLICA", DATABASE, SYSTEM) \
+    M(SYSTEM_SYNC_TRANSACTION_LOG, "SYNC TRANSACTION LOG", GLOBAL, SYSTEM) \
     M(SYSTEM_FLUSH_DISTRIBUTED, "FLUSH DISTRIBUTED", TABLE, SYSTEM_FLUSH) \
     M(SYSTEM_FLUSH_LOGS, "FLUSH LOGS", GLOBAL, SYSTEM_FLUSH) \
     M(SYSTEM_FLUSH, "", GROUP, SYSTEM) \
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index 4b412f56f45..cb2eaa12310 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -224,8 +224,16 @@ public:
         ++this->data(place).denominator;
     }
 
-    void
-    addBatchSinglePlace(
+    void addManyDefaults(
+        AggregateDataPtr __restrict place,
+        const IColumn ** /*columns*/,
+        size_t length,
+        Arena * /*arena*/) const override
+    {
+        this->data(place).denominator += length;
+    }
+
+    void addBatchSinglePlace(
         size_t row_begin,
         size_t row_end,
         AggregateDataPtr place,
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index c2608a530ef..446179d1957 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -53,6 +53,15 @@ public:
         ++data(place).count;
     }
 
+    void addManyDefaults(
+        AggregateDataPtr __restrict place,
+        const IColumn ** /*columns*/,
+        size_t length,
+        Arena * /*arena*/) const override
+    {
+        data(place).count += length;
+    }
+
     void addBatchSinglePlace(
         size_t row_begin,
         size_t row_end,
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index c306a395145..d579a925f9d 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -880,8 +880,9 @@ struct AggregateFunctionMinData : Data
 {
     using Self = AggregateFunctionMinData;
 
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena) { return this->changeIfLess(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                        { return this->changeIfLess(to, arena); }
+    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeIfLess(column, row_num, arena); }
+    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeIfLess(to, arena); }
+    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeIfLess(column, 0, arena); }
 
     static const char * name() { return "min"; }
 
@@ -907,8 +908,9 @@ struct AggregateFunctionMaxData : Data
 {
     using Self = AggregateFunctionMaxData;
 
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena) { return this->changeIfGreater(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                        { return this->changeIfGreater(to, arena); }
+    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeIfGreater(column, row_num, arena); }
+    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeIfGreater(to, arena); }
+    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeIfGreater(column, 0, arena); }
 
     static const char * name() { return "max"; }
 
@@ -935,8 +937,9 @@ struct AggregateFunctionAnyData : Data
     using Self = AggregateFunctionAnyData;
     static constexpr bool is_any = true;
 
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena) { return this->changeFirstTime(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                        { return this->changeFirstTime(to, arena); }
+    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeFirstTime(column, row_num, arena); }
+    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeFirstTime(to, arena); }
+    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeFirstTime(column, 0, arena); }
 
     static const char * name() { return "any"; }
 
@@ -962,8 +965,9 @@ struct AggregateFunctionAnyLastData : Data
 {
     using Self = AggregateFunctionAnyLastData;
 
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena) { return this->changeEveryTime(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                        { return this->changeEveryTime(to, arena); }
+    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeEveryTime(column, row_num, arena); }
+    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeEveryTime(to, arena); }
+    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeEveryTime(column, 0, arena); }
 
     static const char * name() { return "anyLast"; }
 
@@ -1024,6 +1028,8 @@ struct AggregateFunctionSingleValueOrNullData : Data
         return false;
     }
 
+    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeIfBetter(column, 0, arena); }
+
     void insertResultInto(IColumn & to) const
     {
         if (is_null || first_value)
@@ -1098,6 +1104,12 @@ struct AggregateFunctionAnyHeavyData : Data
         return false;
     }
 
+    void addManyDefaults(const IColumn & column, size_t length, Arena * arena)
+    {
+        for (size_t i = 0; i < length; ++i)
+            changeIfBetter(column, 0, arena);
+    }
+
     void write(WriteBuffer & buf, const ISerialization & serialization) const
     {
         Data::write(buf, serialization);
@@ -1158,6 +1170,15 @@ public:
         this->data(place).changeIfBetter(*columns[0], row_num, arena);
     }
 
+    void addManyDefaults(
+        AggregateDataPtr __restrict place,
+        const IColumn ** columns,
+        size_t length,
+        Arena * arena) const override
+    {
+        this->data(place).addManyDefaults(*columns[0], length, arena);
+    }
+
     void addBatchSinglePlace(
         size_t row_begin,
         size_t row_end,
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 03aeda1bb9b..672e9dad9e5 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -489,6 +489,33 @@ public:
         }
     }
 
+    void addManyDefaults(
+        AggregateDataPtr __restrict /*place*/,
+        const IColumn ** /*columns*/,
+        size_t /*length*/,
+        Arena * /*arena*/) const override
+    {
+    }
+
+    void addBatchSparse(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const IColumn ** columns,
+        Arena * arena) const override
+    {
+        const auto & column_sparse = assert_cast<const ColumnSparse &>(*columns[0]);
+        const auto * values = &column_sparse.getValuesColumn();
+        const auto & offsets = column_sparse.getOffsetsData();
+
+        size_t from = std::lower_bound(offsets.begin(), offsets.end(), row_begin) - offsets.begin();
+        size_t to = std::lower_bound(offsets.begin(), offsets.end(), row_end) - offsets.begin();
+
+        for (size_t i = from; i < to; ++i)
+            add(places[offsets[i]] + place_offset, &values, i + 1, arena);
+    }
+
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
         this->data(place).merge(this->data(rhs));
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index b2bf3caebe2..d44937b3f9d 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -237,6 +237,15 @@ public:
         detail::OneAdder<T, Data>::add(this->data(place), *columns[0], row_num);
     }
 
+    void addManyDefaults(
+        AggregateDataPtr __restrict place,
+        const IColumn ** columns,
+        size_t /*length*/,
+        Arena * /*arena*/) const override
+    {
+        detail::OneAdder<T, Data>::add(this->data(place), *columns[0], 0);
+    }
+
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
         this->data(place).set.merge(this->data(rhs).set);
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index 77d20308d5f..73484efc080 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -123,6 +123,10 @@ public:
      */
     virtual void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const = 0;
 
+    /// Adds several default values of arguments into aggregation data on which place points to.
+    /// Default values must be a the 0-th positions in columns.
+    virtual void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t length, Arena * arena) const = 0;
+
     /// Merges state (on which place points to) with other state of current aggregation function.
     virtual void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const = 0;
 
@@ -377,6 +381,16 @@ public:
 
     AddFunc getAddressOfAddFunction() const override { return &addFree; }
 
+    void addManyDefaults(
+        AggregateDataPtr __restrict place,
+        const IColumn ** columns,
+        size_t length,
+        Arena * arena) const override
+    {
+        for (size_t i = 0; i < length; ++i)
+            static_cast<const Derived *>(this)->add(place, columns, 0, arena);
+    }
+
     void addBatch( /// NOLINT
         size_t row_begin,
         size_t row_end,
@@ -413,13 +427,9 @@ public:
     {
         const auto & column_sparse = assert_cast<const ColumnSparse &>(*columns[0]);
         const auto * values = &column_sparse.getValuesColumn();
-        auto offset_it = column_sparse.begin();
+        auto offset_it = column_sparse.getIterator(row_begin);
 
-        /// FIXME: make it more optimal
-        for (size_t i = 0; i < row_begin; ++i, ++offset_it)
-            ;
-
-        for (size_t i = 0; i < row_end; ++i, ++offset_it)
+        for (size_t i = row_begin; i < row_end; ++i, ++offset_it)
             static_cast<const Derived *>(this)->add(places[offset_it.getCurrentRow()] + place_offset,
                                                     &values, offset_it.getValueIndex(), arena);
     }
@@ -468,17 +478,16 @@ public:
         const IColumn ** columns,
         Arena * arena) const override
     {
-        /// TODO: add values and defaults separately if order of adding isn't important.
         const auto & column_sparse = assert_cast<const ColumnSparse &>(*columns[0]);
         const auto * values = &column_sparse.getValuesColumn();
-        auto offset_it = column_sparse.begin();
+        const auto & offsets = column_sparse.getOffsetsData();
 
-        /// FIXME: make it more optimal
-        for (size_t i = 0; i < row_begin; ++i, ++offset_it)
-            ;
+        auto from = std::lower_bound(offsets.begin(), offsets.end(), row_begin) - offsets.begin() + 1;
+        auto to = std::lower_bound(offsets.begin(), offsets.end(), row_end) - offsets.begin() + 1;
 
-        for (size_t i = 0; i < row_end; ++i, ++offset_it)
-            static_cast<const Derived *>(this)->add(place, &values, offset_it.getValueIndex(), arena);
+        size_t num_defaults = (row_end - row_begin) - (to - from);
+        static_cast<const Derived *>(this)->addBatchSinglePlace(from, to, place, &values, arena, -1);
+        static_cast<const Derived *>(this)->addManyDefaults(place, &values, num_defaults, arena);
     }
 
     void addBatchSinglePlaceNotNull( /// NOLINT
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8f6e894a100..10bdc464ac6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,6 +87,7 @@ add_headers_and_sources(clickhouse_common_io IO/S3)
 list (REMOVE_ITEM clickhouse_common_io_sources Common/malloc.cpp Common/new_delete.cpp)
 
 add_headers_and_sources(dbms Disks/IO)
+add_headers_and_sources(dbms Disks/ObjectStorages)
 if (TARGET ch_contrib::sqlite)
     add_headers_and_sources(dbms Databases/SQLite)
 endif()
@@ -113,16 +114,16 @@ endif()
 
 if (TARGET ch_contrib::aws_s3)
     add_headers_and_sources(dbms Common/S3)
-    add_headers_and_sources(dbms Disks/S3)
+    add_headers_and_sources(dbms Disks/ObjectStorages/S3)
 endif()
 
 if (TARGET ch_contrib::azure_sdk)
-    add_headers_and_sources(dbms Disks/AzureBlobStorage)
+    add_headers_and_sources(dbms Disks/ObjectStorages/AzureBlobStorage)
 endif()
 
 if (TARGET ch_contrib::hdfs)
     add_headers_and_sources(dbms Storages/HDFS)
-    add_headers_and_sources(dbms Disks/HDFS)
+    add_headers_and_sources(dbms Disks/ObjectStorages/HDFS)
 endif()
 
 add_headers_and_sources(dbms Storages/Cache)
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 9cc31df0b43..d678441d442 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -285,11 +285,11 @@ void ClientBase::setupSignalHandler()
     sigemptyset(&new_act.sa_mask);
 #else
     if (sigemptyset(&new_act.sa_mask))
-        throw Exception(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler.");
+        throwFromErrno("Cannot set signal handler.", ErrorCodes::CANNOT_SET_SIGNAL_HANDLER);
 #endif
 
     if (sigaction(SIGINT, &new_act, nullptr))
-        throw Exception(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler.");
+        throwFromErrno("Cannot set signal handler.", ErrorCodes::CANNOT_SET_SIGNAL_HANDLER);
 }
 
 
@@ -492,7 +492,8 @@ try
         String pager = config().getString("pager", "");
         if (!pager.empty())
         {
-            signal(SIGPIPE, SIG_IGN);
+            if (SIG_ERR == signal(SIGPIPE, SIG_IGN))
+                throwFromErrno("Cannot set signal handler.", ErrorCodes::CANNOT_SET_SIGNAL_HANDLER);
 
             ShellCommand::Config config(pager);
             config.pipe_stdin_only = true;
diff --git a/src/Columns/ColumnSparse.cpp b/src/Columns/ColumnSparse.cpp
index 4273ebac0be..c6f0c753d64 100644
--- a/src/Columns/ColumnSparse.cpp
+++ b/src/Columns/ColumnSparse.cpp
@@ -772,6 +772,14 @@ size_t ColumnSparse::getValueIndex(size_t n) const
     return it - offsets_data.begin() + 1;
 }
 
+ColumnSparse::Iterator ColumnSparse::getIterator(size_t n) const
+{
+    const auto & offsets_data = getOffsetsData();
+    const auto * it = std::lower_bound(offsets_data.begin(), offsets_data.end(), n);
+    size_t current_offset = it - offsets_data.begin();
+    return Iterator(offsets_data, _size, current_offset, n);
+}
+
 ColumnPtr recursiveRemoveSparse(const ColumnPtr & column)
 {
     if (!column)
diff --git a/src/Columns/ColumnSparse.h b/src/Columns/ColumnSparse.h
index aa0ab8a0cbc..04d8f6ae9b8 100644
--- a/src/Columns/ColumnSparse.h
+++ b/src/Columns/ColumnSparse.h
@@ -215,6 +215,7 @@ public:
 
     Iterator begin() const { return Iterator(getOffsetsData(), _size, 0, 0); }
     Iterator end() const { return Iterator(getOffsetsData(), _size, getOffsetsData().size(), _size); }
+    Iterator getIterator(size_t n) const;
 
 private:
     using Inserter = std::function<void(IColumn &)>;
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index 5d5ce052aaa..973dde10756 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -628,6 +628,7 @@
     M(657, UNSUPPORTED_MEILISEARCH_TYPE) \
     M(658, MEILISEARCH_MISSING_SOME_COLUMNS) \
     M(659, UNKNOWN_STATUS_OF_TRANSACTION) \
+    M(660, HDFS_ERROR) \
     \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
diff --git a/src/Common/FileCache.cpp b/src/Common/FileCache.cpp
index ae1b1afdd09..707ee7ec3d2 100644
--- a/src/Common/FileCache.cpp
+++ b/src/Common/FileCache.cpp
@@ -72,6 +72,8 @@ void IFileCache::assertInitialized() const
 
 LRUFileCache::LRUFileCache(const String & cache_base_path_, const FileCacheSettings & cache_settings_)
     : IFileCache(cache_base_path_, cache_settings_)
+    , max_stash_element_size(cache_settings_.max_elements)
+    , enable_cache_hits_threshold(cache_settings_.enable_cache_hits_threshold)
     , log(&Poco::Logger::get("LRUFileCache"))
 {
 }
@@ -404,9 +406,42 @@ LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
             "Cache already exists for key: `{}`, offset: {}, size: {}.\nCurrent cache structure: {}",
             keyToStr(key), offset, size, dumpStructureUnlocked(key, cache_lock));
 
-    auto file_segment = std::make_shared<FileSegment>(offset, size, key, this, state);
-    FileSegmentCell cell(std::move(file_segment), this, cache_lock);
+    auto skip_or_download = [&]() -> FileSegmentPtr
+    {
+        if (state == FileSegment::State::EMPTY && enable_cache_hits_threshold)
+        {
+            auto record = records.find({key, offset});
 
+            if (record == records.end())
+            {
+                auto queue_iter = stash_queue.add(key, offset, 0, cache_lock);
+                records.insert({{key, offset}, queue_iter});
+
+                if (stash_queue.getElementsNum(cache_lock) > max_stash_element_size)
+                {
+                    auto remove_queue_iter = stash_queue.begin();
+                    records.erase({remove_queue_iter->key, remove_queue_iter->offset});
+                    stash_queue.remove(remove_queue_iter, cache_lock);
+                }
+
+                /// For segments that do not reach the download threshold, we do not download them, but directly read them
+                return std::make_shared<FileSegment>(offset, size, key, this, FileSegment::State::SKIP_CACHE);
+            }
+            else
+            {
+                auto queue_iter = record->second;
+                queue_iter->hits++;
+                stash_queue.moveToEnd(queue_iter, cache_lock);
+
+                state = queue_iter->hits >= enable_cache_hits_threshold ? FileSegment::State::EMPTY : FileSegment::State::SKIP_CACHE;
+                return std::make_shared<FileSegment>(offset, size, key, this, state);
+            }
+        }
+        else
+            return std::make_shared<FileSegment>(offset, size, key, this, state);
+    };
+
+    FileSegmentCell cell(skip_or_download(), this, cache_lock);
     auto & offsets = files[key];
 
     if (offsets.empty())
@@ -471,7 +506,7 @@ bool LRUFileCache::tryReserve(
     std::vector<FileSegmentCell *> to_evict;
     std::vector<FileSegmentCell *> trash;
 
-    for (const auto & [entry_key, entry_offset, entry_size] : queue)
+    for (const auto & [entry_key, entry_offset, entry_size, _] : queue)
     {
         if (!is_overflow())
             break;
@@ -603,10 +638,6 @@ void LRUFileCache::remove(const Key & key)
 
     if (fs::exists(key_path))
         fs::remove(key_path);
-
-#ifndef NDEBUG
-    assertCacheCorrectness(cache_lock);
-#endif
 }
 
 void LRUFileCache::remove()
@@ -619,7 +650,7 @@ void LRUFileCache::remove()
     std::vector<FileSegment *> to_remove;
     for (auto it = queue.begin(); it != queue.end();)
     {
-        const auto & [key, offset, size] = *it++;
+        const auto & [key, offset, size, _] = *it++;
         auto * cell = getCell(key, offset, cache_lock);
         if (!cell)
             throw Exception(
@@ -637,6 +668,10 @@ void LRUFileCache::remove()
             }
         }
     }
+
+    /// Remove all access information.
+    records.clear();
+    stash_queue.removeAll(cache_lock);
 }
 
 void LRUFileCache::remove(
@@ -882,6 +917,7 @@ LRUFileCache::FileSegmentCell::FileSegmentCell(
             queue_iterator = cache->queue.add(file_segment->key(), file_segment->offset(), file_segment->range().size(), cache_lock);
             break;
         }
+        case FileSegment::State::SKIP_CACHE:
         case FileSegment::State::EMPTY:
         case FileSegment::State::DOWNLOADING:
         {
@@ -898,7 +934,7 @@ LRUFileCache::LRUQueue::Iterator LRUFileCache::LRUQueue::add(
     const IFileCache::Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & /* cache_lock */)
 {
 #ifndef NDEBUG
-    for (const auto & [entry_key, entry_offset, _] : queue)
+    for (const auto & [entry_key, entry_offset, entry_size, entry_hits] : queue)
     {
         if (entry_key == key && entry_offset == offset)
             throw Exception(
@@ -918,6 +954,12 @@ void LRUFileCache::LRUQueue::remove(Iterator queue_it, std::lock_guard<std::mute
     queue.erase(queue_it);
 }
 
+void LRUFileCache::LRUQueue::removeAll(std::lock_guard<std::mutex> & /* cache_lock */)
+{
+    queue.clear();
+    cache_size = 0;
+}
+
 void LRUFileCache::LRUQueue::moveToEnd(Iterator queue_it, std::lock_guard<std::mutex> & /* cache_lock */)
 {
     queue.splice(queue.end(), queue, queue_it);
@@ -934,7 +976,7 @@ bool LRUFileCache::LRUQueue::contains(
 {
     /// This method is used for assertions in debug mode.
     /// So we do not care about complexity here.
-    for (const auto & [entry_key, entry_offset, size] : queue)
+    for (const auto & [entry_key, entry_offset, size, _] : queue)
     {
         if (key == entry_key && offset == entry_offset)
             return true;
@@ -947,7 +989,7 @@ void LRUFileCache::LRUQueue::assertCorrectness(LRUFileCache * cache, std::lock_g
     [[maybe_unused]] size_t total_size = 0;
     for (auto it = queue.begin(); it != queue.end();)
     {
-        auto & [key, offset, size] = *it++;
+        auto & [key, offset, size, _] = *it++;
 
         auto * cell = cache->getCell(key, offset, cache_lock);
         if (!cell)
@@ -969,7 +1011,7 @@ void LRUFileCache::LRUQueue::assertCorrectness(LRUFileCache * cache, std::lock_g
 String LRUFileCache::LRUQueue::toString(std::lock_guard<std::mutex> & /* cache_lock */) const
 {
     String result;
-    for (const auto & [key, offset, size] : queue)
+    for (const auto & [key, offset, size, _] : queue)
     {
         if (!result.empty())
             result += ", ";
diff --git a/src/Common/FileCache.h b/src/Common/FileCache.h
index ff65b579470..f66287b805f 100644
--- a/src/Common/FileCache.h
+++ b/src/Common/FileCache.h
@@ -7,6 +7,7 @@
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>
+#include <boost/functional/hash.hpp>
 #include <boost/noncopyable.hpp>
 #include <map>
 
@@ -165,6 +166,7 @@ private:
             Key key;
             size_t offset;
             size_t size;
+            size_t hits = 0;
 
             FileKeyAndOffset(const Key & key_, size_t offset_, size_t size_) : key(key_), offset(offset_), size(size_) {}
         };
@@ -194,6 +196,8 @@ private:
 
         Iterator end() { return queue.end(); }
 
+        void removeAll(std::lock_guard<std::mutex> & cache_lock);
+
     private:
         std::list<FileKeyAndOffset> queue;
         size_t cache_size = 0;
@@ -223,8 +227,26 @@ private:
     using FileSegmentsByOffset = std::map<size_t, FileSegmentCell>;
     using CachedFiles = std::unordered_map<Key, FileSegmentsByOffset>;
 
+    using AccessKeyAndOffset = std::pair<Key, size_t>;
+
+    struct KeyAndOffsetHash
+    {
+        std::size_t operator()(const AccessKeyAndOffset & key) const
+        {
+            return std::hash<UInt128>()(key.first) ^ std::hash<UInt64>()(key.second);
+        }
+    };
+
+    using AccessRecord = std::unordered_map<AccessKeyAndOffset, LRUQueue::Iterator, KeyAndOffsetHash>;
+
     CachedFiles files;
     LRUQueue queue;
+
+    LRUQueue stash_queue;
+    AccessRecord records;
+    size_t max_stash_element_size;
+    size_t enable_cache_hits_threshold;
+
     Poco::Logger * log;
 
     FileSegments getImpl(
diff --git a/src/Common/FileCacheSettings.cpp b/src/Common/FileCacheSettings.cpp
index f555de277b2..6982068e40f 100644
--- a/src/Common/FileCacheSettings.cpp
+++ b/src/Common/FileCacheSettings.cpp
@@ -11,6 +11,7 @@ void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration &
     max_elements = config.getUInt64(config_prefix + ".data_cache_max_elements", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS);
     max_file_segment_size = config.getUInt64(config_prefix + ".max_file_segment_size", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE);
     cache_on_write_operations = config.getUInt64(config_prefix + ".cache_on_write_operations", false);
+    enable_cache_hits_threshold = config.getUInt64(config_prefix + ".enable_cache_hits_threshold", REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD);
 }
 
 }
diff --git a/src/Common/FileCacheSettings.h b/src/Common/FileCacheSettings.h
index 0b34e1e3d82..2f508c3ef46 100644
--- a/src/Common/FileCacheSettings.h
+++ b/src/Common/FileCacheSettings.h
@@ -14,6 +14,8 @@ struct FileCacheSettings
     size_t max_file_segment_size = REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE;
     bool cache_on_write_operations = false;
 
+    size_t enable_cache_hits_threshold = REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD;
+
     void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 };
 
diff --git a/src/Common/FileCache_fwd.h b/src/Common/FileCache_fwd.h
index 7448f0c8c89..8a7c2eeb458 100644
--- a/src/Common/FileCache_fwd.h
+++ b/src/Common/FileCache_fwd.h
@@ -7,6 +7,7 @@ namespace DB
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_CACHE_SIZE = 1024 * 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE = 100 * 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS = 1024 * 1024;
+static constexpr int REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD = 0;
 
 class IFileCache;
 using FileCachePtr = std::shared_ptr<IFileCache>;
diff --git a/src/Common/FileSegment.cpp b/src/Common/FileSegment.cpp
index 356ba8bf55f..27a111c1297 100644
--- a/src/Common/FileSegment.cpp
+++ b/src/Common/FileSegment.cpp
@@ -59,6 +59,10 @@ FileSegment::FileSegment(
             downloader_id = getCallerId();
             break;
         }
+        case (State::SKIP_CACHE):
+        {
+            break;
+        }
         default:
         {
             throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Can create cell with either EMPTY, DOWNLOADED, DOWNLOADING state");
@@ -525,6 +529,14 @@ void FileSegment::complete(std::lock_guard<std::mutex> & cache_lock)
 
 void FileSegment::completeUnlocked(std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock)
 {
+    bool is_last_holder = cache->isLastFileSegmentHolder(key(), offset(), cache_lock, segment_lock);
+
+    if (is_last_holder && download_state == State::SKIP_CACHE)
+    {
+        cache->remove(key(), offset(), cache_lock, segment_lock);
+        return;
+    }
+
     if (download_state == State::SKIP_CACHE || is_detached)
         return;
 
@@ -542,8 +554,7 @@ void FileSegment::completeUnlocked(std::lock_guard<std::mutex> & cache_lock, std
         /// Segment state can be changed from DOWNLOADING or EMPTY only if the caller is the
         /// downloader or the only owner of the segment.
 
-        bool can_update_segment_state = isDownloaderImpl(segment_lock)
-            || cache->isLastFileSegmentHolder(key(), offset(), cache_lock, segment_lock);
+        bool can_update_segment_state = isDownloaderImpl(segment_lock) || is_last_holder;
 
         if (can_update_segment_state)
             download_state = State::PARTIALLY_DOWNLOADED;
diff --git a/src/Common/OptimizedRegularExpression.cpp b/src/Common/OptimizedRegularExpression.cpp
index da348adbe31..cfc364929a3 100644
--- a/src/Common/OptimizedRegularExpression.cpp
+++ b/src/Common/OptimizedRegularExpression.cpp
@@ -17,7 +17,7 @@ namespace DB
 
 template <bool thread_safe>
 void OptimizedRegularExpressionImpl<thread_safe>::analyze(
-    const std::string & regexp,
+    std::string_view regexp,
     std::string & required_substring,
     bool & is_trivial,
     bool & required_substring_is_prefix)
diff --git a/src/Common/OptimizedRegularExpression.h b/src/Common/OptimizedRegularExpression.h
index a3d38f27c07..eaa7b06e309 100644
--- a/src/Common/OptimizedRegularExpression.h
+++ b/src/Common/OptimizedRegularExpression.h
@@ -86,8 +86,6 @@ public:
     /// Get the regexp re2 or nullptr if the pattern is trivial (for output to the log).
     const std::unique_ptr<RegexType> & getRE2() const { return re2; }
 
-    static void analyze(const std::string & regexp_, std::string & required_substring, bool & is_trivial, bool & required_substring_is_prefix);
-
     void getAnalyzeResult(std::string & out_required_substring, bool & out_is_trivial, bool & out_required_substring_is_prefix) const
     {
         out_required_substring = required_substring;
@@ -104,6 +102,8 @@ private:
     std::optional<DB::StringSearcher<false, true>> case_insensitive_substring_searcher;
     std::unique_ptr<RegexType> re2;
     unsigned number_of_subpatterns;
+
+    static void analyze(std::string_view regexp_, std::string & required_substring, bool & is_trivial, bool & required_substring_is_prefix);
 };
 
 using OptimizedRegularExpression = OptimizedRegularExpressionImpl<true>;
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 7f3b9788c1f..9fa47ff959c 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -144,6 +144,13 @@
     M(MergeTreeDataWriterBlocks, "Number of blocks INSERTed to MergeTree tables. Each block forms a data part of level zero.") \
     M(MergeTreeDataWriterBlocksAlreadySorted, "Number of blocks INSERTed to MergeTree tables that appeared to be already sorted.") \
     \
+    M(InsertedWideParts, "Number of parts inserted in Wide format.") \
+    M(InsertedCompactParts, "Number of parts inserted in Compact format.") \
+    M(InsertedInMemoryParts, "Number of parts inserted in InMemory format.") \
+    M(MergedIntoWideParts, "Number of parts merged into Wide format.") \
+    M(MergedIntoCompactParts, "Number of parts merged into Compact format.") \
+    M(MergedIntoInMemoryParts, "Number of parts in merged into InMemory format.") \
+    \
     M(MergeTreeDataProjectionWriterRows, "Number of rows INSERTed to MergeTree tables projection.") \
     M(MergeTreeDataProjectionWriterUncompressedBytes, "Uncompressed bytes (for columns as they stored in memory) INSERTed to MergeTree tables projection.") \
     M(MergeTreeDataProjectionWriterCompressedBytes, "Bytes written to filesystem for data INSERTed to MergeTree tables projection.") \
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index 9d07edeb502..2db049717ac 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -1,3 +1,5 @@
+// NOLINTBEGIN(readability-inconsistent-declaration-parameter-name)
+
 #include <csignal>
 #include <sys/time.h>
 #if defined(OS_LINUX)
@@ -317,3 +319,5 @@ FOR_EACH_WRAPPED_FUNCTION(MAKE_WRAPPER)
 #    undef MAKE_WRAPPER
 #endif
 }
+
+// NOLINTEND(readability-inconsistent-declaration-parameter-name)
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index ca06b21ab3a..6d9e0859692 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -1,10 +1,8 @@
 #include "filesystemHelpers.h"
 
-#include <sys/stat.h>
 #if defined(__linux__)
 #    include <cstdio>
 #    include <mntent.h>
-#    include <sys/stat.h>
 #    include <sys/sysmacros.h>
 #endif
 #include <cerrno>
@@ -13,6 +11,7 @@
 #include <filesystem>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <utime.h>
 #include <IO/ReadBufferFromFile.h>
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index bfe296198d1..db622fa1dcb 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -1934,12 +1934,12 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(
                     ? list_watches
                     : watches;
 
-                watches_type[zk_request->getPath()].emplace_back(session_id);
+                watches_type[zk_request->getPath()].emplace(session_id);
                 sessions_and_watchers[session_id].emplace(zk_request->getPath());
             }
             else if (response->error == Coordination::Error::ZNONODE && zk_request->getOpNum() == Coordination::OpNum::Exists)
             {
-                watches[zk_request->getPath()].emplace_back(session_id);
+                watches[zk_request->getPath()].emplace(session_id);
                 sessions_and_watchers[session_id].emplace(zk_request->getPath());
             }
         }
@@ -2009,13 +2009,7 @@ void KeeperStorage::clearDeadWatches(int64_t session_id)
             if (watch != watches.end())
             {
                 auto & watches_for_path = watch->second;
-                for (auto w_it = watches_for_path.begin(); w_it != watches_for_path.end();)
-                {
-                    if (*w_it == session_id)
-                        w_it = watches_for_path.erase(w_it);
-                    else
-                        ++w_it;
-                }
+                watches_for_path.erase(session_id);
                 if (watches_for_path.empty())
                     watches.erase(watch);
             }
@@ -2025,13 +2019,7 @@ void KeeperStorage::clearDeadWatches(int64_t session_id)
             if (list_watch != list_watches.end())
             {
                 auto & list_watches_for_path = list_watch->second;
-                for (auto w_it = list_watches_for_path.begin(); w_it != list_watches_for_path.end();)
-                {
-                    if (*w_it == session_id)
-                        w_it = list_watches_for_path.erase(w_it);
-                    else
-                        ++w_it;
-                }
+                list_watches_for_path.erase(session_id);
                 if (list_watches_for_path.empty())
                     list_watches.erase(list_watch);
             }
@@ -2053,7 +2041,7 @@ void KeeperStorage::dumpWatches(WriteBufferFromOwnString & buf) const
 
 void KeeperStorage::dumpWatchesByPath(WriteBufferFromOwnString & buf) const
 {
-    auto write_int_vec = [&buf](const std::vector<int64_t> & session_ids)
+    auto write_int_container = [&buf](const auto & session_ids)
     {
         for (int64_t session_id : session_ids)
         {
@@ -2064,13 +2052,13 @@ void KeeperStorage::dumpWatchesByPath(WriteBufferFromOwnString & buf) const
     for (const auto & [watch_path, sessions] : watches)
     {
         buf << watch_path << "\n";
-        write_int_vec(sessions);
+        write_int_container(sessions);
     }
 
     for (const auto & [watch_path, sessions] : list_watches)
     {
         buf << watch_path << "\n";
-        write_int_vec(sessions);
+        write_int_container(sessions);
     }
 }
 
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index e2fb921fcdf..6adfd1c7020 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -117,7 +117,7 @@ public:
     using Container = SnapshotableHashTable<Node>;
     using Ephemerals = std::unordered_map<int64_t, std::unordered_set<std::string>>;
     using SessionAndWatcher = std::unordered_map<int64_t, std::unordered_set<std::string>>;
-    using SessionIDs = std::vector<int64_t>;
+    using SessionIDs = std::unordered_set<int64_t>;
 
     /// Just vector of SHA1 from user:password
     using AuthIDs = std::vector<AuthID>;
diff --git a/src/Core/ColumnNumbers.h b/src/Core/ColumnNumbers.h
index 37507a6d683..51054435e17 100644
--- a/src/Core/ColumnNumbers.h
+++ b/src/Core/ColumnNumbers.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <unordered_set>
 #include <vector>
 
 
@@ -7,6 +8,8 @@ namespace DB
 {
 
 using ColumnNumbers = std::vector<size_t>;
+using ColumnNumbersSet = std::unordered_set<size_t>;
 using ColumnNumbersList = std::vector<ColumnNumbers>;
+using ColumnNumbersSetList = std::vector<ColumnNumbersSet>;
 
 }
diff --git a/src/Core/Names.h b/src/Core/Names.h
index 3281daa560e..003168bde27 100644
--- a/src/Core/Names.h
+++ b/src/Core/Names.h
@@ -16,6 +16,7 @@ using NameOrderedSet = std::set<std::string>;
 using NameToNameMap = std::unordered_map<std::string, std::string>;
 using NameToNameSetMap = std::unordered_map<std::string, NameSet>;
 using NameToNameVector = std::vector<std::pair<std::string, std::string>>;
+using NameToIndexMap = std::unordered_map<std::string, size_t>;
 
 using NameWithAlias = std::pair<std::string, std::string>;
 using NamesWithAliases = std::vector<NameWithAlias>;
diff --git a/src/Core/NamesAndTypes.cpp b/src/Core/NamesAndTypes.cpp
index bd24a9e82bd..72768ce23fb 100644
--- a/src/Core/NamesAndTypes.cpp
+++ b/src/Core/NamesAndTypes.cpp
@@ -1,3 +1,4 @@
+#include <cstddef>
 #include <Core/NamesAndTypes.h>
 
 #include <base/sort.h>
@@ -214,4 +215,17 @@ std::optional<NameAndTypePair> NamesAndTypesList::tryGetByName(const std::string
     }
     return {};
 }
+
+size_t NamesAndTypesList::getPosByName(const std::string &name) const noexcept
+{
+    size_t pos = 0;
+    for (const NameAndTypePair & column : *this)
+    {
+        if (column.name == name)
+            break;
+        ++pos;
+    }
+    return pos;
+}
+
 }
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index 2719017a726..b9c03aae0ca 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -105,8 +105,11 @@ public:
     /// Check that column contains in list
     bool contains(const String & name) const;
 
-    /// Try to get column by name, return empty optional if column not found
+    /// Try to get column by name, returns empty optional if column not found
     std::optional<NameAndTypePair> tryGetByName(const std::string & name) const;
+
+    /// Try to get column position by name, returns number of columns if column isn't found
+    size_t getPosByName(const std::string & name) const noexcept;
 };
 
 using NamesAndTypesLists = std::vector<NamesAndTypesList>;
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index bf9785fcc00..c241955b268 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -86,6 +86,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(UInt64, s3_max_connections, 1024, "The maximum number of connections per server.", 0) \
     M(Bool, s3_truncate_on_insert, false, "Enables or disables truncate before insert in s3 engine tables.", 0) \
     M(Bool, s3_create_new_file_on_insert, false, "Enables or disables creating a new file on each insert in s3 engine tables", 0) \
+    M(Bool, enable_s3_requests_logging, false, "Enable very explicit logging of S3 requests. Makes sense for debug only.", 0) \
     M(UInt64, hdfs_replication, 0, "The actual number of replications can be specified when the hdfs file is created.", 0) \
     M(Bool, hdfs_truncate_on_insert, false, "Enables or disables truncate before insert in s3 engine tables", 0) \
     M(Bool, hdfs_create_new_file_on_insert, false, "Enables or disables creating a new file on each insert in hdfs engine tables", 0) \
@@ -566,7 +567,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     \
     M(UInt64, remote_fs_read_max_backoff_ms, 10000, "Max wait time when trying to read data for remote disk", 0) \
     M(UInt64, remote_fs_read_backoff_max_tries, 5, "Max attempts to read with backoff", 0) \
-    M(Bool, enable_filesystem_cache, true, "Use cache for remote filesystem. This setting does not turn on/off cache for disks (must me done via disk config), but allows to bypass cache for some queries if intended", 0) \
+    M(Bool, enable_filesystem_cache, true, "Use cache for remote filesystem. This setting does not turn on/off cache for disks (must be done via disk config), but allows to bypass cache for some queries if intended", 0) \
     M(UInt64, filesystem_cache_max_wait_sec, 5, "Allow to wait at most this number of seconds for download of current remote_fs_buffer_size bytes, and skip cache if exceeded", 0) \
     M(Bool, enable_filesystem_cache_on_write_operations, false, "Write into cache on write operations. To actually work this setting requires be added to disk config too", 0) \
     M(Bool, enable_filesystem_cache_log, false, "Allows to record the filesystem caching log for each query", 0) \
@@ -673,6 +674,8 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, input_format_json_read_bools_as_numbers, true, "Allow to parse bools as numbers in JSON input formats", 0) \
     M(Bool, input_format_protobuf_flatten_google_wrappers, false, "Enable Google wrappers for regular non-nested columns, e.g. google.protobuf.StringValue 'str' for String column 'str'. For Nullable columns empty wrappers are recognized as defaults, and missing as nulls", 0) \
     M(Bool, output_format_protobuf_nullables_with_google_wrappers, false, "When serializing Nullable columns with Google wrappers, serialize default values as empty wrappers. If turned off, default and null values are not serialized", 0) \
+    M(UInt64, input_format_csv_skip_first_lines, 0, "Skip specified number of lines at the beginning of data in CSV format", 0) \
+    M(UInt64, input_format_tsv_skip_first_lines, 0, "Skip specified number of lines at the beginning of data in TSV format", 0) \
     \
     M(DateTimeInputFormat, date_time_input_format, FormatSettings::DateTimeInputFormat::Basic, "Method to read DateTime from text input formats. Possible values: 'basic', 'best_effort' and 'best_effort_us'.", 0) \
     M(DateTimeOutputFormat, date_time_output_format, FormatSettings::DateTimeOutputFormat::Simple, "Method to write DateTime to text output. Possible values: 'simple', 'iso', 'unix_timestamp'.", 0) \
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index c545ae753de..d35865d35c6 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -9,6 +9,8 @@
 #include <IO/WriteHelpers.h>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <cmath>
+
 
 namespace DB
 {
@@ -16,6 +18,7 @@ namespace ErrorCodes
 {
     extern const int SIZE_OF_FIXED_STRING_DOESNT_MATCH;
     extern const int CANNOT_PARSE_BOOL;
+    extern const int CANNOT_PARSE_NUMBER;
 }
 
 
@@ -176,27 +179,75 @@ UInt64 SettingFieldMaxThreads::getAuto()
     return getNumberOfPhysicalCPUCores();
 }
 
+namespace
+{
+    Poco::Timespan::TimeDiff float64AsSecondsToTimespan(Float64 d)
+    {
+        if (d != 0.0 && !std::isnormal(d))
+            throw Exception(
+                ErrorCodes::CANNOT_PARSE_NUMBER, "A setting's value in seconds must be a normal floating point number or zero. Got {}", d);
+        return static_cast<Poco::Timespan::TimeDiff>(d * 1000000);
+    }
 
-template <SettingFieldTimespanUnit unit_>
-SettingFieldTimespan<unit_>::SettingFieldTimespan(const Field & f) : SettingFieldTimespan(fieldToNumber<UInt64>(f))
+}
+
+template <>
+SettingFieldSeconds::SettingFieldTimespan(const Field & f) : SettingFieldTimespan(float64AsSecondsToTimespan(fieldToNumber<Float64>(f)))
 {
 }
 
-template <SettingFieldTimespanUnit unit_>
-SettingFieldTimespan<unit_> & SettingFieldTimespan<unit_>::operator=(const Field & f)
+template <>
+SettingFieldMilliseconds::SettingFieldTimespan(const Field & f) : SettingFieldTimespan(fieldToNumber<UInt64>(f))
+{
+}
+
+template <>
+SettingFieldTimespan<SettingFieldTimespanUnit::Second> & SettingFieldSeconds::operator=(const Field & f)
+{
+    *this = Poco::Timespan{float64AsSecondsToTimespan(fieldToNumber<Float64>(f))};
+    return *this;
+}
+
+template <>
+SettingFieldTimespan<SettingFieldTimespanUnit::Millisecond> & SettingFieldMilliseconds::operator=(const Field & f)
 {
     *this = fieldToNumber<UInt64>(f);
     return *this;
 }
 
-template <SettingFieldTimespanUnit unit_>
-String SettingFieldTimespan<unit_>::toString() const
+template <>
+String SettingFieldSeconds::toString() const
+{
+    return ::DB::toString(static_cast<Float64>(value.totalMicroseconds()) / microseconds_per_unit);
+}
+
+template <>
+String SettingFieldMilliseconds::toString() const
 {
     return ::DB::toString(operator UInt64());
 }
 
-template <SettingFieldTimespanUnit unit_>
-void SettingFieldTimespan<unit_>::parseFromString(const String & str)
+template <>
+SettingFieldSeconds::operator Field() const
+{
+    return static_cast<Float64>(value.totalMicroseconds()) / microseconds_per_unit;
+}
+
+template <>
+SettingFieldMilliseconds::operator Field() const
+{
+    return operator UInt64();
+}
+
+template <>
+void SettingFieldSeconds::parseFromString(const String & str)
+{
+    Float64 n = parse<Float64>(str.data(), str.size());
+    *this = Poco::Timespan{static_cast<Poco::Timespan::TimeDiff>(n * microseconds_per_unit)};
+}
+
+template <>
+void SettingFieldMilliseconds::parseFromString(const String & str)
 {
     *this = stringToNumber<UInt64>(str);
 }
@@ -204,6 +255,13 @@ void SettingFieldTimespan<unit_>::parseFromString(const String & str)
 template <SettingFieldTimespanUnit unit_>
 void SettingFieldTimespan<unit_>::writeBinary(WriteBuffer & out) const
 {
+    /// Note that this returns an UInt64 (for both seconds and milliseconds units) for compatibility reasons as the value
+    /// for seconds used to be a integer (now a Float64)
+    /// This method is only used to communicate with clients or servers older than DBMS_MIN_REVISION_WITH_SETTINGS_SERIALIZED_AS_STRINGS
+    /// in which the value was passed as binary (as a UInt64)
+    /// Later versions pass the setting values as String (using toString() and parseFromString()) and there passing "1.2" will
+    /// lead to `1` on releases with integer seconds or `1.2` on more recent releases
+    /// See https://github.com/ClickHouse/ClickHouse/issues/36940 for more details
     auto num_units = operator UInt64();
     writeVarUInt(num_units, out);
 }
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 474786eb963..dcc99f4a2c0 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -124,7 +124,7 @@ struct SettingFieldTimespan
     operator std::chrono::duration<Rep, Period>() const { return std::chrono::duration_cast<std::chrono::duration<Rep, Period>>(std::chrono::microseconds(value.totalMicroseconds())); } /// NOLINT
 
     explicit operator UInt64() const { return value.totalMicroseconds() / microseconds_per_unit; }
-    explicit operator Field() const { return operator UInt64(); }
+    explicit operator Field() const;
 
     Poco::Timespan::TimeDiff totalMicroseconds() const { return value.totalMicroseconds(); }
     Poco::Timespan::TimeDiff totalMilliseconds() const { return value.totalMilliseconds(); }
diff --git a/src/Core/SortCursor.h b/src/Core/SortCursor.h
index 584556045e8..ca6667e9898 100644
--- a/src/Core/SortCursor.h
+++ b/src/Core/SortCursor.h
@@ -222,11 +222,7 @@ struct SimpleSortCursor : SortCursorHelper<SimpleSortCursor>
 
     bool ALWAYS_INLINE greaterAt(const SimpleSortCursor & rhs, size_t lhs_pos, size_t rhs_pos) const
     {
-        const auto & desc = impl->desc[0];
-        int direction = desc.direction;
-        int nulls_direction = desc.nulls_direction;
-
-        bool result = false;
+        int res = 0;
 
 #if USE_EMBEDDED_COMPILER
         if (impl->desc.compiled_sort_description && rhs.impl->desc.compiled_sort_description)
@@ -234,17 +230,23 @@ struct SimpleSortCursor : SortCursorHelper<SimpleSortCursor>
             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;
+            res = sort_description_func_typed(lhs_pos, rhs_pos, impl->raw_sort_columns_data.data(), rhs.impl->raw_sort_columns_data.data()); /// NOLINT
         }
         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)));
+            const auto & desc = impl->desc[0];
+            int direction = desc.direction;
+            int nulls_direction = desc.nulls_direction;
+            res = direction * impl->sort_columns[0]->compareAt(lhs_pos, rhs_pos, *(rhs.impl->sort_columns[0]), nulls_direction);
         }
 
-        return result;
+        if (res > 0)
+            return true;
+        if (res < 0)
+            return false;
+
+        return impl->order > rhs.impl->order;
     }
 };
 
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index f7cfbab289a..1b1e4611dc2 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -68,6 +68,14 @@
 
 namespace fs = std::filesystem;
 
+namespace DB
+{
+    namespace ErrorCodes
+    {
+        extern const int CANNOT_SET_SIGNAL_HANDLER;
+    }
+}
+
 DB::PipeFDs signal_pipe;
 
 
@@ -76,7 +84,8 @@ DB::PipeFDs signal_pipe;
   */
 static void call_default_signal_handler(int sig)
 {
-    signal(sig, SIG_DFL);
+    if (SIG_ERR == signal(sig, SIG_DFL))
+        DB::throwFromErrno("Cannot set signal handler.", DB::ErrorCodes::CANNOT_SET_SIGNAL_HANDLER);
     raise(sig);
 }
 
@@ -498,9 +507,8 @@ BaseDaemon::~BaseDaemon()
     signal_listener_thread.join();
     /// Reset signals to SIG_DFL to avoid trying to write to the signal_pipe that will be closed after.
     for (int sig : handled_signals)
-    {
-        signal(sig, SIG_DFL);
-    }
+        if (SIG_ERR == signal(sig, SIG_DFL))
+            DB::throwFromErrno("Cannot set signal handler.", DB::ErrorCodes::CANNOT_SET_SIGNAL_HANDLER);
     signal_pipe.close();
 }
 
diff --git a/src/DataTypes/Serializations/SerializationNothing.h b/src/DataTypes/Serializations/SerializationNothing.h
index 2de93a29763..e46a1e6ed30 100644
--- a/src/DataTypes/Serializations/SerializationNothing.h
+++ b/src/DataTypes/Serializations/SerializationNothing.h
@@ -16,7 +16,7 @@ class SerializationNothing : public SimpleTextSerialization
 private:
     [[noreturn]] static void throwNoSerialization()
     {
-        throw Exception("Serialization is not implemented", ErrorCodes::NOT_IMPLEMENTED);
+        throw Exception("Serialization is not implemented for type Nothing", ErrorCodes::NOT_IMPLEMENTED);
     }
 public:
     void serializeBinary(const Field &, WriteBuffer &) const override                       { throwNoSerialization(); }
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 279867542e2..446518be5cd 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -89,7 +89,7 @@ bool DatabaseMySQL::empty() const
         return true;
 
     for (const auto & [table_name, storage_info] : local_tables_cache)
-        if (!remove_or_detach_tables.count(table_name))
+        if (!remove_or_detach_tables.contains(table_name))
             return false;
 
     return true;
@@ -103,7 +103,7 @@ DatabaseTablesIteratorPtr DatabaseMySQL::getTablesIterator(ContextPtr local_cont
     fetchTablesIntoLocalCache(local_context);
 
     for (const auto & [table_name, modify_time_and_storage] : local_tables_cache)
-        if (!remove_or_detach_tables.count(table_name) && (!filter_by_table_name || filter_by_table_name(table_name)))
+        if (!remove_or_detach_tables.contains(table_name) && (!filter_by_table_name || filter_by_table_name(table_name)))
             tables[table_name] = modify_time_and_storage.second;
 
     return std::make_unique<DatabaseTablesSnapshotIterator>(tables, database_name);
@@ -120,7 +120,7 @@ StoragePtr DatabaseMySQL::tryGetTable(const String & mysql_table_name, ContextPt
 
     fetchTablesIntoLocalCache(local_context);
 
-    if (!remove_or_detach_tables.count(mysql_table_name) && local_tables_cache.find(mysql_table_name) != local_tables_cache.end())
+    if (!remove_or_detach_tables.contains(mysql_table_name) && local_tables_cache.find(mysql_table_name) != local_tables_cache.end())
         return local_tables_cache[mysql_table_name].second;
 
     return StoragePtr{};
@@ -349,11 +349,11 @@ void DatabaseMySQL::attachTable(ContextPtr /* context_ */, const String & table_
 {
     std::lock_guard<std::mutex> lock{mutex};
 
-    if (!local_tables_cache.count(table_name))
+    if (!local_tables_cache.contains(table_name))
         throw Exception("Cannot attach table " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(table_name) +
             " because it does not exist.", ErrorCodes::UNKNOWN_TABLE);
 
-    if (!remove_or_detach_tables.count(table_name))
+    if (!remove_or_detach_tables.contains(table_name))
         throw Exception("Cannot attach table " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(table_name) +
             " because it already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
 
@@ -372,11 +372,11 @@ StoragePtr DatabaseMySQL::detachTable(ContextPtr /* context */, const String & t
 {
     std::lock_guard<std::mutex> lock{mutex};
 
-    if (remove_or_detach_tables.count(table_name))
+    if (remove_or_detach_tables.contains(table_name))
         throw Exception("Table " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(table_name) + " is dropped",
             ErrorCodes::TABLE_IS_DROPPED);
 
-    if (!local_tables_cache.count(table_name))
+    if (!local_tables_cache.contains(table_name))
         throw Exception("Table " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(table_name) + " doesn't exist.",
             ErrorCodes::UNKNOWN_TABLE);
 
@@ -412,7 +412,7 @@ void DatabaseMySQL::detachTablePermanently(ContextPtr, const String & table_name
 
     fs::path remove_flag = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
 
-    if (remove_or_detach_tables.count(table_name))
+    if (remove_or_detach_tables.contains(table_name))
         throw Exception(ErrorCodes::TABLE_IS_DROPPED, "Table {}.{} is dropped", backQuoteIfNeed(database_name), backQuoteIfNeed(table_name));
 
     if (fs::exists(remove_flag))
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 012750bde60..5624f9595d7 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -252,7 +252,7 @@ Strings DictionaryStructure::getKeysNames() const
 static void checkAttributeKeys(const Poco::Util::AbstractConfiguration::Keys & keys)
 {
     static const std::unordered_set<std::string_view> valid_keys
-        = {"name", "type", "expression", "null_value", "hierarchical", "injective", "is_object_id"};
+        = {"name", "type", "expression", "null_value", "hierarchical", "bidirectional", "injective", "is_object_id"};
 
     for (const auto & key : keys)
     {
@@ -350,6 +350,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         }
 
         const auto hierarchical = config.getBool(prefix + "hierarchical", false);
+        const auto bidirectional = config.getBool(prefix + "bidirectional", false);
         const auto injective = config.getBool(prefix + "injective", false);
         const auto is_object_id = config.getBool(prefix + "is_object_id", false);
 
@@ -362,6 +363,9 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         if (has_hierarchy && hierarchical)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only one hierarchical attribute supported");
 
+        if (bidirectional && !hierarchical)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bidirectional can only be applied to hierarchical attributes");
+
         has_hierarchy = has_hierarchy || hierarchical;
 
         res_attributes.emplace_back(DictionaryAttribute{
@@ -372,6 +376,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             expression,
             null_value,
             hierarchical,
+            bidirectional,
             injective,
             is_object_id,
             is_nullable});
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 50cfba01894..bb4c306affa 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -67,6 +67,7 @@ struct DictionaryAttribute final
     const std::string expression;
     const Field null_value;
     const bool hierarchical;
+    const bool bidirectional;
     const bool injective;
     const bool is_object_id;
     const bool is_nullable;
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 2fe9f09741b..bd664224d41 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -43,6 +43,7 @@ FlatDictionary::FlatDictionary(
 {
     createAttributes();
     loadData();
+    buildHierarchyParentToChildIndexIfNeeded();
     calculateBytesAllocated();
 }
 
@@ -244,30 +245,43 @@ ColumnUInt8::Ptr FlatDictionary::isInHierarchy(
     return result;
 }
 
-ColumnPtr FlatDictionary::getDescendants(
-    ColumnPtr key_column,
-    const DataTypePtr &,
-    size_t level) const
+DictionaryHierarchyParentToChildIndexPtr FlatDictionary::getHierarchicalIndex() const
 {
-    PaddedPODArray<UInt64> keys_backup;
-    const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+    if (hierarhical_index)
+        return hierarhical_index;
 
     size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
     const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
     const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
 
     HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+    parent_to_child.reserve(element_count);
 
-    for (size_t i = 0; i < parent_keys.size(); ++i)
+    UInt64 child_keys_size = static_cast<UInt64>(parent_keys.size());
+
+    for (UInt64 child_key = 0; child_key < child_keys_size; ++child_key)
     {
-        auto parent_key = parent_keys[i];
+        if (!loaded_keys[child_key])
+            continue;
 
-        if (loaded_keys[i])
-            parent_to_child[parent_key].emplace_back(static_cast<UInt64>(i));
+        auto parent_key = parent_keys[child_key];
+        parent_to_child[parent_key].emplace_back(child_key);
     }
 
+    return std::make_shared<DictionaryHierarchicalParentToChildIndex>(parent_to_child);
+}
+
+ColumnPtr FlatDictionary::getDescendants(
+    ColumnPtr key_column,
+    const DataTypePtr &,
+    size_t level,
+    DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index) const
+{
+    PaddedPODArray<UInt64> keys_backup;
+    const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+
     size_t keys_found;
-    auto result = getKeysDescendantsArray(keys, parent_to_child, level, keys_found);
+    auto result = getKeysDescendantsArray(keys, *parent_to_child_index, level, keys_found);
 
     query_count.fetch_add(keys.size(), std::memory_order_relaxed);
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
@@ -400,6 +414,15 @@ void FlatDictionary::loadData()
         throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY, "{}: dictionary source is empty and 'require_nonempty' property is set.", getFullName());
 }
 
+void FlatDictionary::buildHierarchyParentToChildIndexIfNeeded()
+{
+    if (!dict_struct.hierarchical_attribute_index)
+        return;
+
+    if (dict_struct.attributes[*dict_struct.hierarchical_attribute_index].bidirectional)
+        hierarhical_index = getHierarchicalIndex();
+}
+
 void FlatDictionary::calculateBytesAllocated()
 {
     bytes_allocated += attributes.size() * sizeof(attributes.front());
@@ -439,6 +462,12 @@ void FlatDictionary::calculateBytesAllocated()
     if (update_field_loaded_block)
         bytes_allocated += update_field_loaded_block->allocatedBytes();
 
+    if (hierarhical_index)
+    {
+        hierarchical_index_bytes_allocated = hierarhical_index->getSizeInBytes();
+        bytes_allocated += hierarchical_index_bytes_allocated;
+    }
+
     bytes_allocated += string_arena.size();
 }
 
@@ -614,7 +643,7 @@ void registerDictionaryFlat(DictionaryFactory & factory)
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
 
-        return std::make_unique<FlatDictionary>(dict_id, dict_struct, std::move(source_ptr), std::move(configuration));
+        return std::make_unique<FlatDictionary>(dict_id, dict_struct, std::move(source_ptr), configuration);
     };
 
     factory.registerLayout("flat", create_layout, false);
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index f342c38802d..9ae3e9a2e71 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -92,10 +92,15 @@ public:
         ColumnPtr in_key_column,
         const DataTypePtr & key_type) const override;
 
+    DictionaryHierarchicalParentToChildIndexPtr getHierarchicalIndex() const override;
+
+    size_t getHierarchicalIndexBytesAllocated() const override { return hierarchical_index_bytes_allocated; }
+
     ColumnPtr getDescendants(
         ColumnPtr key_column,
         const DataTypePtr & key_type,
-        size_t level) const override;
+        size_t level,
+        DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index) const override;
 
     Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
@@ -137,10 +142,15 @@ private:
     };
 
     void createAttributes();
+
     void blockToAttributes(const Block & block);
+
     void updateData();
+
     void loadData();
 
+    void buildHierarchyParentToChildIndexIfNeeded();
+
     void calculateBytesAllocated();
 
     Attribute createAttribute(const DictionaryAttribute & attribute);
@@ -165,6 +175,7 @@ private:
     std::vector<bool> loaded_keys;
 
     size_t bytes_allocated = 0;
+    size_t hierarchical_index_bytes_allocated = 0;
     size_t element_count = 0;
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
@@ -172,6 +183,7 @@ private:
 
     BlockPtr update_field_loaded_block;
     Arena string_arena;
+    DictionaryHierarchicalParentToChildIndexPtr hierarhical_index;
 };
 
 }
diff --git a/src/Dictionaries/HashedArrayDictionary.cpp b/src/Dictionaries/HashedArrayDictionary.cpp
index 5a2586147b8..66c63b7330d 100644
--- a/src/Dictionaries/HashedArrayDictionary.cpp
+++ b/src/Dictionaries/HashedArrayDictionary.cpp
@@ -37,6 +37,7 @@ HashedArrayDictionary<dictionary_key_type>::HashedArrayDictionary(
 {
     createAttributes();
     loadData();
+    buildHierarchyParentToChildIndexIfNeeded();
     calculateBytesAllocated();
 }
 
@@ -282,18 +283,14 @@ ColumnUInt8::Ptr HashedArrayDictionary<dictionary_key_type>::isInHierarchy(
 }
 
 template <DictionaryKeyType dictionary_key_type>
-ColumnPtr HashedArrayDictionary<dictionary_key_type>::getDescendants(
-    ColumnPtr key_column [[maybe_unused]],
-    const DataTypePtr &,
-    size_t level [[maybe_unused]]) const
+DictionaryHierarchicalParentToChildIndexPtr HashedArrayDictionary<dictionary_key_type>::getHierarchicalIndex() const
 {
     if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
-        PaddedPODArray<UInt64> keys_backup;
-        const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+        if (hierarchical_index)
+            return hierarchical_index;
 
         size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
-
         const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
         const AttributeContainerType<UInt64> & parent_keys_container = std::get<AttributeContainerType<UInt64>>(hierarchical_attribute.container);
 
@@ -306,6 +303,7 @@ ColumnPtr HashedArrayDictionary<dictionary_key_type>::getDescendants(
             index_to_key[value] = key;
 
         HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+        parent_to_child.reserve(index_to_key.size());
 
         for (size_t i = 0; i < parent_keys_container.size(); ++i)
         {
@@ -313,13 +311,33 @@ ColumnPtr HashedArrayDictionary<dictionary_key_type>::getDescendants(
             if (it == index_to_key.end())
                 continue;
 
-            auto parent_key = it->getMapped();
-            auto child_key = parent_keys_container[i];
+            auto child_key = it->getMapped();
+            auto parent_key = parent_keys_container[i];
             parent_to_child[parent_key].emplace_back(child_key);
         }
 
+        return std::make_shared<DictionaryHierarchicalParentToChildIndex>(parent_to_child);
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr HashedArrayDictionary<dictionary_key_type>::getDescendants(
+    ColumnPtr key_column [[maybe_unused]],
+    const DataTypePtr &,
+    size_t level [[maybe_unused]],
+    DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index [[maybe_unused]]) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+    {
+        PaddedPODArray<UInt64> keys_backup;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+
         size_t keys_found = 0;
-        auto result = getKeysDescendantsArray(keys, parent_to_child, level, keys_found);
+        auto result = getKeysDescendantsArray(keys, *parent_to_child_index, level, keys_found);
 
         query_count.fetch_add(keys.size(), std::memory_order_relaxed);
         found_count.fetch_add(keys_found, std::memory_order_relaxed);
@@ -693,6 +711,16 @@ void HashedArrayDictionary<dictionary_key_type>::loadData()
             getFullName());
 }
 
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::buildHierarchyParentToChildIndexIfNeeded()
+{
+    if (!dict_struct.hierarchical_attribute_index)
+        return;
+
+    if (dict_struct.attributes[*dict_struct.hierarchical_attribute_index].bidirectional)
+        hierarchical_index = getHierarchicalIndex();
+}
+
 template <DictionaryKeyType dictionary_key_type>
 void HashedArrayDictionary<dictionary_key_type>::calculateBytesAllocated()
 {
@@ -730,10 +758,16 @@ void HashedArrayDictionary<dictionary_key_type>::calculateBytesAllocated()
             bytes_allocated += (*attribute.is_index_null).size();
     }
 
-    bytes_allocated += string_arena.size();
-
     if (update_field_loaded_block)
         bytes_allocated += update_field_loaded_block->allocatedBytes();
+
+    if (hierarchical_index)
+    {
+        hierarchical_index_bytes_allocated = hierarchical_index->getSizeInBytes();
+        bytes_allocated += hierarchical_index_bytes_allocated;
+    }
+
+    bytes_allocated += string_arena.size();
 }
 
 template <DictionaryKeyType dictionary_key_type>
diff --git a/src/Dictionaries/HashedArrayDictionary.h b/src/Dictionaries/HashedArrayDictionary.h
index a649fddcc39..8df9ce4c1f7 100644
--- a/src/Dictionaries/HashedArrayDictionary.h
+++ b/src/Dictionaries/HashedArrayDictionary.h
@@ -109,10 +109,15 @@ public:
         ColumnPtr in_key_column,
         const DataTypePtr & key_type) const override;
 
+    DictionaryHierarchicalParentToChildIndexPtr getHierarchicalIndex() const override;
+
+    size_t getHierarchicalIndexBytesAllocated() const override { return hierarchical_index_bytes_allocated; }
+
     ColumnPtr getDescendants(
         ColumnPtr key_column,
         const DataTypePtr & key_type,
-        size_t level) const override;
+        size_t level,
+        DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index) const override;
 
     Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
@@ -173,6 +178,8 @@ private:
 
     void loadData();
 
+    void buildHierarchyParentToChildIndexIfNeeded();
+
     void calculateBytesAllocated();
 
     template <typename KeysProvider>
@@ -214,6 +221,7 @@ private:
     KeyAttribute key_attribute;
 
     size_t bytes_allocated = 0;
+    size_t hierarchical_index_bytes_allocated = 0;
     size_t element_count = 0;
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
@@ -221,6 +229,7 @@ private:
 
     BlockPtr update_field_loaded_block;
     Arena string_arena;
+    DictionaryHierarchicalParentToChildIndexPtr hierarchical_index;
 };
 
 extern template class HashedArrayDictionary<DictionaryKeyType::Simple>;
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 7025922da12..81d3d42617b 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -54,6 +54,7 @@ HashedDictionary<dictionary_key_type, sparse>::HashedDictionary(
 {
     createAttributes();
     loadData();
+    buildHierarchyParentToChildIndexIfNeeded();
     calculateBytesAllocated();
 }
 
@@ -317,29 +318,46 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::isInHierarchy(
         return nullptr;
 }
 
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+DictionaryHierarchyParentToChildIndexPtr HashedDictionary<dictionary_key_type, sparse>::getHierarchicalIndex() const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+    {
+        if (hierarchical_index)
+            return hierarchical_index;
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+        const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+        const CollectionType<UInt64> & parent_keys = std::get<CollectionType<UInt64>>(hierarchical_attribute.container);
+
+        HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+        parent_to_child.reserve(parent_keys.size());
+
+        for (const auto & [key, value] : parent_keys)
+            parent_to_child[value].emplace_back(key);
+
+        return std::make_shared<DictionaryHierarchicalParentToChildIndex>(parent_to_child);
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
 template <DictionaryKeyType dictionary_key_type, bool sparse>
 ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getDescendants(
     ColumnPtr key_column [[maybe_unused]],
     const DataTypePtr &,
-    size_t level [[maybe_unused]]) const
+    size_t level [[maybe_unused]],
+    DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index [[maybe_unused]]) const
 {
     if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
         PaddedPODArray<UInt64> keys_backup;
         const auto & keys = getColumnVectorData(this, key_column, keys_backup);
 
-        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
-
-        const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
-        const CollectionType<UInt64> & parent_keys = std::get<CollectionType<UInt64>>(hierarchical_attribute.container);
-
-        HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
-
-        for (const auto & [key, value] : parent_keys)
-            parent_to_child[value].emplace_back(key);
-
         size_t keys_found;
-        auto result = getKeysDescendantsArray(keys, parent_to_child, level, keys_found);
+        auto result = getKeysDescendantsArray(keys, *parent_to_child_index, level, keys_found);
 
         query_count.fetch_add(keys.size(), std::memory_order_relaxed);
         found_count.fetch_add(keys_found, std::memory_order_relaxed);
@@ -347,7 +365,9 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getDescendants(
         return result;
     }
     else
+    {
         return nullptr;
+    }
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse>
@@ -631,6 +651,16 @@ void HashedDictionary<dictionary_key_type, sparse>::loadData()
             getFullName());
 }
 
+template <DictionaryKeyType dictionary_key_type, bool sparse>
+void HashedDictionary<dictionary_key_type, sparse>::buildHierarchyParentToChildIndexIfNeeded()
+{
+    if (!dict_struct.hierarchical_attribute_index)
+        return;
+
+    if (dict_struct.attributes[*dict_struct.hierarchical_attribute_index].bidirectional)
+        hierarchical_index = getHierarchicalIndex();
+}
+
 template <DictionaryKeyType dictionary_key_type, bool sparse>
 void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
 {
@@ -684,10 +714,16 @@ void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
         }
     }
 
-    bytes_allocated += string_arena.size();
-
     if (update_field_loaded_block)
         bytes_allocated += update_field_loaded_block->allocatedBytes();
+
+    if (hierarchical_index)
+    {
+        hierarchical_index_bytes_allocated = hierarchical_index->getSizeInBytes();
+        bytes_allocated += hierarchical_index_bytes_allocated;
+    }
+
+    bytes_allocated += string_arena.size();
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse>
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 1ef1c58b67c..ba5d284466a 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -110,10 +110,15 @@ public:
         ColumnPtr in_key_column,
         const DataTypePtr & key_type) const override;
 
+    DictionaryHierarchicalParentToChildIndexPtr getHierarchicalIndex() const override;
+
+    size_t getHierarchicalIndexBytesAllocated() const override { return hierarchical_index_bytes_allocated; }
+
     ColumnPtr getDescendants(
         ColumnPtr key_column,
         const DataTypePtr & key_type,
-        size_t level) const override;
+        size_t level,
+        DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index) const override;
 
     Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
@@ -194,6 +199,8 @@ private:
 
     void loadData();
 
+    void buildHierarchyParentToChildIndexIfNeeded();
+
     void calculateBytesAllocated();
 
     template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
@@ -218,6 +225,7 @@ private:
     std::vector<Attribute> attributes;
 
     size_t bytes_allocated = 0;
+    size_t hierarchical_index_bytes_allocated = 0;
     size_t element_count = 0;
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
@@ -226,6 +234,7 @@ private:
     BlockPtr update_field_loaded_block;
     Arena string_arena;
     NoAttributesCollectionType no_attributes_container;
+    DictionaryHierarchicalParentToChildIndexPtr hierarchical_index;
 };
 
 extern template class HashedDictionary<DictionaryKeyType::Simple, false>;
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.cpp b/src/Dictionaries/HierarchyDictionariesUtils.cpp
index dd729fe636c..0b5f8478f7a 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.cpp
+++ b/src/Dictionaries/HierarchyDictionariesUtils.cpp
@@ -8,6 +8,22 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
+namespace detail
+{
+    ColumnPtr convertElementsAndOffsetsIntoArray(ElementsAndOffsets && elements_and_offsets)
+    {
+        auto elements_column = ColumnVector<UInt64>::create();
+        elements_column->getData() = std::move(elements_and_offsets.elements);
+
+        auto offsets_column = ColumnVector<IColumn::Offset>::create();
+        offsets_column->getData() = std::move(elements_and_offsets.offsets);
+
+        auto column_array = ColumnArray::create(std::move(elements_column), std::move(offsets_column));
+
+        return column_array;
+    }
+}
+
 namespace
 {
     /** In case of cache or direct dictionary we does not have structure with child to parent representation.
@@ -84,6 +100,26 @@ namespace
     }
 }
 
+ColumnPtr getKeysDescendantsArray(
+    const PaddedPODArray<UInt64> & requested_keys,
+    const DictionaryHierarchicalParentToChildIndex & parent_to_child_index,
+    size_t level,
+    size_t & valid_keys)
+{
+    if (level == 0)
+    {
+        detail::GetAllDescendantsStrategy strategy { .level = level };
+        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child_index, strategy, valid_keys);
+        return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
+    }
+    else
+    {
+        detail::GetDescendantsAtSpecificLevelStrategy strategy { .level = level };
+        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child_index, strategy, valid_keys);
+        return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
+    }
+}
+
 ColumnPtr getKeysHierarchyDefaultImplementation(
     const IDictionary * dictionary,
     ColumnPtr key_column,
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.h b/src/Dictionaries/HierarchyDictionariesUtils.h
index f0c6b4b1a0f..6a59a37b5e7 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.h
+++ b/src/Dictionaries/HierarchyDictionariesUtils.h
@@ -14,25 +14,65 @@
 namespace DB
 {
 
+class DictionaryHierarchicalParentToChildIndex;
+using DictionaryHierarchyParentToChildIndexPtr = std::shared_ptr<DictionaryHierarchicalParentToChildIndex>;
+
+class DictionaryHierarchicalParentToChildIndex
+{
+public:
+    struct KeysRange
+    {
+        UInt32 start_index;
+        UInt32 end_index;
+    };
+
+    explicit DictionaryHierarchicalParentToChildIndex(const HashMap<UInt64, PaddedPODArray<UInt64>> & parent_to_children_map_)
+    {
+        size_t parent_to_children_map_size = parent_to_children_map_.size();
+
+        keys.reserve(parent_to_children_map_size);
+        parent_to_children_keys_range.reserve(parent_to_children_map_size);
+
+        for (auto & [parent, children] : parent_to_children_map_)
+        {
+            size_t keys_size = keys.size();
+            UInt32 start_index = static_cast<UInt32>(keys_size);
+            UInt32 end_index = start_index + static_cast<UInt32>(children.size());
+
+            keys.insert(children.begin(), children.end());
+
+            parent_to_children_keys_range[parent] = KeysRange{start_index, end_index};
+        }
+    }
+
+    size_t getSizeInBytes() const
+    {
+        return parent_to_children_keys_range.getBufferSizeInBytes() + (keys.size() * sizeof(UInt64));
+    }
+
+    /// Map parent key to range of children from keys array
+    HashMap<UInt64, KeysRange> parent_to_children_keys_range;
+
+    /// Array of keys in hierarchy
+    PaddedPODArray<UInt64> keys;
+};
+
 namespace detail
 {
-    template <typename KeyType>
     struct ElementsAndOffsets
     {
-        PaddedPODArray<KeyType> elements;
+        PaddedPODArray<UInt64> elements;
         PaddedPODArray<IColumn::Offset> offsets;
     };
 
-    template <typename T>
     struct IsKeyValidFuncInterface
     {
-        bool operator()(T key [[maybe_unused]]) { return false; }
+        bool operator()(UInt64 key [[maybe_unused]]) { return false; }
     };
 
-    template <typename T>
     struct GetParentKeyFuncInterface
     {
-        std::optional<T> operator()(T key [[maybe_unused]]) { return {}; }
+        std::optional<UInt64> operator()(UInt64 key [[maybe_unused]]) { return {}; }
     };
 
     /** Calculate hierarchy for keys iterating the hierarchy from child to parent using get_parent_key_func provided by client.
@@ -54,16 +94,16 @@ namespace detail
       * Elements: [1, 2, 1, 3, 1, 4, 2, 1]
       * Offsets: [1, 3, 5, 8, 8]
       */
-    template <typename KeyType, typename IsKeyValidFunc, typename GetParentKeyFunc>
-    ElementsAndOffsets<KeyType> getHierarchy(
-        const PaddedPODArray<KeyType> & keys,
-        const KeyType & hierarchy_null_value,
+    template <typename IsKeyValidFunc, typename GetParentKeyFunc>
+    ElementsAndOffsets getHierarchy(
+        const PaddedPODArray<UInt64> & keys,
+        const UInt64 & hierarchy_null_value,
         IsKeyValidFunc && is_key_valid_func,
         GetParentKeyFunc && get_parent_key_func)
     {
         size_t hierarchy_keys_size = keys.size();
 
-        PaddedPODArray<KeyType> elements;
+        PaddedPODArray<UInt64> elements;
         elements.reserve(hierarchy_keys_size);
 
         PaddedPODArray<IColumn::Offset> offsets;
@@ -75,7 +115,7 @@ namespace detail
             size_t array_element_offset;
         };
 
-        HashMap<KeyType, OffsetInArray> already_processes_keys_to_offset;
+        HashMap<UInt64, OffsetInArray> already_processes_keys_to_offset;
         already_processes_keys_to_offset.reserve(hierarchy_keys_size);
 
         for (size_t i = 0; i < hierarchy_keys_size; ++i)
@@ -123,7 +163,7 @@ namespace detail
                 elements.emplace_back(hierarchy_key);
                 ++current_hierarchy_depth;
 
-                std::optional<KeyType> parent_key = std::forward<GetParentKeyFunc>(get_parent_key_func)(hierarchy_key);
+                std::optional<UInt64> parent_key = std::forward<GetParentKeyFunc>(get_parent_key_func)(hierarchy_key);
 
                 if (!parent_key.has_value())
                     break;
@@ -134,7 +174,7 @@ namespace detail
             offsets.emplace_back(elements.size());
         }
 
-        ElementsAndOffsets<KeyType> result = {std::move(elements), std::move(offsets)};
+        ElementsAndOffsets result = {std::move(elements), std::move(offsets)};
 
         return result;
     }
@@ -146,11 +186,11 @@ namespace detail
       *
       * Not: keys size must be equal to in_keys_size.
       */
-    template <typename KeyType, typename IsKeyValidFunc, typename GetParentKeyFunc>
+    template <typename IsKeyValidFunc, typename GetParentKeyFunc>
     PaddedPODArray<UInt8> getIsInHierarchy(
-        const PaddedPODArray<KeyType> & keys,
-        const PaddedPODArray<KeyType> & in_keys,
-        const KeyType & hierarchy_null_value,
+        const PaddedPODArray<UInt64> & keys,
+        const PaddedPODArray<UInt64> & in_keys,
+        const UInt64 & hierarchy_null_value,
         IsKeyValidFunc && is_key_valid_func,
         GetParentKeyFunc && get_parent_func)
     {
@@ -159,7 +199,7 @@ namespace detail
         PaddedPODArray<UInt8> result;
         result.resize_fill(keys.size());
 
-        detail::ElementsAndOffsets<KeyType> hierarchy = detail::getHierarchy(
+        detail::ElementsAndOffsets hierarchy = detail::getHierarchy(
             keys,
             hierarchy_null_value,
             std::forward<IsKeyValidFunc>(is_key_valid_func),
@@ -216,19 +256,22 @@ namespace detail
       * Result: [1], [2, 3], [4], [], [];
       * Offsets: [1, 3, 4, 4, 4];
       */
-    template <typename KeyType, typename Strategy>
-    ElementsAndOffsets<KeyType> getDescendants(
-        const PaddedPODArray<KeyType> & keys,
-        const HashMap<KeyType, PaddedPODArray<KeyType>> & parent_to_child,
+    template <typename Strategy>
+    ElementsAndOffsets getDescendants(
+        const PaddedPODArray<UInt64> & keys,
+        const DictionaryHierarchicalParentToChildIndex & parent_to_child_index,
         Strategy strategy,
         size_t & valid_keys)
     {
+        auto & parent_to_children_keys_range = parent_to_child_index.parent_to_children_keys_range;
+        auto & children_keys = parent_to_child_index.keys;
+
         /// If strategy is GetAllDescendantsStrategy we try to cache and later reuse previously calculated descendants.
         /// If strategy is GetDescendantsAtSpecificLevelStrategy we does not use cache strategy.
         size_t keys_size = keys.size();
         valid_keys = 0;
 
-        PaddedPODArray<KeyType> descendants;
+        PaddedPODArray<UInt64> descendants;
         descendants.reserve(keys_size);
 
         PaddedPODArray<IColumn::Offset> descendants_offsets;
@@ -241,18 +284,18 @@ namespace detail
         };
 
         static constexpr Int64 key_range_requires_update = -1;
-        HashMap<KeyType, Range> already_processed_keys_to_range [[maybe_unused]];
+        HashMap<UInt64, Range> already_processed_keys_to_range [[maybe_unused]];
 
         if constexpr (std::is_same_v<Strategy, GetAllDescendantsStrategy>)
             already_processed_keys_to_range.reserve(keys_size);
 
         struct KeyAndDepth
         {
-            KeyType key;
+            UInt64 key;
             Int64 depth;
         };
 
-        HashSet<KeyType> already_processed_keys_during_loop;
+        HashSet<UInt64> already_processed_keys_during_loop;
         already_processed_keys_during_loop.reserve(keys_size);
 
         PaddedPODArray<KeyAndDepth> next_keys_to_process_stack;
@@ -262,9 +305,9 @@ namespace detail
 
         for (size_t i = 0; i < keys_size; ++i)
         {
-            const KeyType & requested_key = keys[i];
+            const UInt64 & requested_key = keys[i];
 
-            if (parent_to_child.find(requested_key) == nullptr)
+            if (parent_to_children_keys_range.find(requested_key) == nullptr)
             {
                 descendants_offsets.emplace_back(descendants.size());
                 continue;
@@ -282,7 +325,7 @@ namespace detail
             {
                 KeyAndDepth key_to_process = next_keys_to_process_stack.back();
 
-                KeyType key = key_to_process.key;
+                UInt64 key = key_to_process.key;
                 Int64 depth = key_to_process.depth;
                 next_keys_to_process_stack.pop_back();
 
@@ -329,7 +372,7 @@ namespace detail
                     }
                 }
 
-                const auto * it = parent_to_child.find(key);
+                const auto * it = parent_to_children_keys_range.find(key);
 
                 if (!it || depth >= DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH)
                     continue;
@@ -352,15 +395,26 @@ namespace detail
 
                 ++depth;
 
-                const auto & children = it->getMapped();
+                DictionaryHierarchicalParentToChildIndex::KeysRange children_range = it->getMapped();
 
-                for (auto child_key : children)
+                for (; children_range.start_index < children_range.end_index; ++children_range.start_index)
                 {
+                    auto child_key = children_keys[children_range.start_index];
+
                     /// In case of GetAllDescendantsStrategy we add any descendant to result array
                     /// If strategy is GetDescendantsAtSpecificLevelStrategy we require depth == level
-                    if (std::is_same_v<Strategy, GetAllDescendantsStrategy> || depth == level)
+                    if constexpr (std::is_same_v<Strategy, GetAllDescendantsStrategy>)
                         descendants.emplace_back(child_key);
 
+                    if constexpr (std::is_same_v<Strategy, GetDescendantsAtSpecificLevelStrategy>)
+                    {
+                        if (depth == level)
+                        {
+                            descendants.emplace_back(child_key);
+                            continue;
+                        }
+                    }
+
                     next_keys_to_process_stack.emplace_back(KeyAndDepth{child_key, depth});
                 }
             }
@@ -370,24 +424,12 @@ namespace detail
             descendants_offsets.emplace_back(descendants.size());
         }
 
-        ElementsAndOffsets<KeyType> result = {std::move(descendants), std::move(descendants_offsets)};
+        ElementsAndOffsets result = {std::move(descendants), std::move(descendants_offsets)};
         return result;
     }
 
     /// Converts ElementAndOffsets structure into ArrayColumn
-    template<typename KeyType>
-    ColumnPtr convertElementsAndOffsetsIntoArray(ElementsAndOffsets<KeyType> && elements_and_offsets)
-    {
-        auto elements_column = ColumnVector<KeyType>::create();
-        elements_column->getData() = std::move(elements_and_offsets.elements);
-
-        auto offsets_column = ColumnVector<IColumn::Offset>::create();
-        offsets_column->getData() = std::move(elements_and_offsets.offsets);
-
-        auto column_array = ColumnArray::create(std::move(elements_column), std::move(offsets_column));
-
-        return column_array;
-    }
+    ColumnPtr convertElementsAndOffsetsIntoArray(ElementsAndOffsets && elements_and_offsets);
 }
 
 /// Returns hierarchy array column for keys
@@ -432,26 +474,11 @@ ColumnUInt8::Ptr getKeysIsInHierarchyColumn(
 /// Returns descendants array column for keys
 ///
 /// @param valid_keys - number of keys that are valid in parent_to_child map
-template <typename KeyType>
 ColumnPtr getKeysDescendantsArray(
-    const PaddedPODArray<KeyType> & requested_keys,
-    const HashMap<KeyType, PaddedPODArray<KeyType>> & parent_to_child,
+    const PaddedPODArray<UInt64> & requested_keys,
+    const DictionaryHierarchicalParentToChildIndex & parent_to_child_index,
     size_t level,
-    size_t & valid_keys)
-{
-    if (level == 0)
-    {
-        detail::GetAllDescendantsStrategy strategy { .level = level };
-        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy, valid_keys);
-        return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
-    }
-    else
-    {
-        detail::GetDescendantsAtSpecificLevelStrategy strategy { .level = level };
-        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy, valid_keys);
-        return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
-    }
-}
+    size_t & valid_keys);
 
 /** Default getHierarchy implementation for dictionaries that does not have structure with child to parent representation.
   * Implementation will build such structure with getColumn calls, and then getHierarchy for such structure.
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index c18dbcfbea7..32c81beee6f 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -24,6 +24,9 @@ namespace ErrorCodes
 class IDictionary;
 using DictionaryPtr = std::unique_ptr<IDictionary>;
 
+class DictionaryHierarchicalParentToChildIndex;
+using DictionaryHierarchicalParentToChildIndexPtr = std::shared_ptr<DictionaryHierarchicalParentToChildIndex>;
+
 /** DictionaryKeyType provides IDictionary client information about
   * which key type is supported by dictionary.
   *
@@ -228,10 +231,23 @@ public:
                         getDictionaryID().getNameForLogs());
     }
 
+    virtual DictionaryHierarchicalParentToChildIndexPtr getHierarchicalIndex() const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Method getHierarchicalIndex is not supported for {} dictionary.",
+                        getDictionaryID().getNameForLogs());
+    }
+
+    virtual size_t getHierarchicalIndexBytesAllocated() const
+    {
+        return 0;
+    }
+
     virtual ColumnPtr getDescendants(
         ColumnPtr key_column [[maybe_unused]],
         const DataTypePtr & key_type [[maybe_unused]],
-        size_t level [[maybe_unused]]) const
+        size_t level [[maybe_unused]],
+        DictionaryHierarchicalParentToChildIndexPtr parent_to_child_index [[maybe_unused]]) const
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "Method getDescendants is not supported for {} dictionary.",
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index 57d61ce5724..22ca5a5b08c 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -16,6 +16,13 @@
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/MySQL/MySQLHelpers.h>
 #include <Storages/MySQL/MySQLSettings.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Common/LocalDateTime.h>
+#include <Common/logger_useful.h>
+#include "readInvalidateQuery.h"
 
 
 namespace DB
@@ -118,15 +125,6 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 
 
 #if USE_MYSQL
-#    include <Columns/ColumnString.h>
-#    include <DataTypes/DataTypeString.h>
-#    include <IO/WriteBufferFromString.h>
-#    include <IO/WriteHelpers.h>
-#    include <Common/LocalDateTime.h>
-#    include <Common/logger_useful.h>
-#    include "readInvalidateQuery.h"
-#    include <mysqlxx/Exception.h>
-#    include <Core/Settings.h>
 
 namespace DB
 {
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 20230b1bd32..261e9166ec8 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -104,7 +104,7 @@ ColumnPtr RangeHashedDictionary<dictionary_key_type>::getColumn(
 
     /// Cast range column to storage type
     Columns modified_key_columns = key_columns;
-    auto range_storage_column = key_columns.back();
+    const ColumnPtr & range_storage_column = key_columns.back();
     ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types.back(), ""};
     modified_key_columns.back() = castColumnAccurate(column_to_cast, dict_struct.range_min->type);
 
@@ -314,7 +314,7 @@ ColumnUInt8::Ptr RangeHashedDictionary<dictionary_key_type>::hasKeys(const Colum
     }
 
     /// Cast range column to storage type
-    auto range_storage_column = key_columns.back();
+    const ColumnPtr & range_storage_column = key_columns.back();
     ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types.back(), ""};
     auto range_column_updated = castColumnAccurate(column_to_cast, dict_struct.range_min->type);
     auto key_columns_copy = key_columns;
@@ -513,7 +513,7 @@ void RangeHashedDictionary<dictionary_key_type>::getItemsImpl(
 
     size_t keys_found = 0;
 
-    auto range_column = key_columns.back();
+    const ColumnPtr & range_column = key_columns.back();
     auto key_columns_copy = key_columns;
     key_columns_copy.pop_back();
 
@@ -984,7 +984,7 @@ Pipe RangeHashedDictionary<dictionary_key_type>::read(const Names & column_names
         Columns result;
         result.reserve(attribute_names_size);
 
-        auto key_column = key_columns.back();
+        const ColumnPtr & key_column = key_columns.back();
 
         const auto * key_to_index_column = typeid_cast<const ColumnUInt64 *>(key_column.get());
         if (!key_to_index_column)
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 28a842ccd8c..edc3c34fe81 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -290,6 +290,14 @@ void buildSingleAttribute(
         attribute_element->appendChild(hierarchical_element);
     }
 
+    if (dict_attr->bidirectional)
+    {
+        AutoPtr<Element> bidirectional_element(doc->createElement("bidirectional"));
+        AutoPtr<Text> bidirectional(doc->createTextNode("true"));
+        bidirectional_element->appendChild(bidirectional);
+        attribute_element->appendChild(bidirectional_element);
+    }
+
     if (dict_attr->injective)
     {
         AutoPtr<Element> injective_element(doc->createElement("injective"));
diff --git a/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp b/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
index f4854b7c77e..a68f23a978f 100644
--- a/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
+++ b/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
@@ -151,13 +151,15 @@ TEST(HierarchyDictionariesUtils, getDescendants)
         parent_to_child[1].emplace_back(3);
         parent_to_child[2].emplace_back(4);
 
+        auto parent_to_child_index = std::make_shared<DictionaryHierarchicalParentToChildIndex>(parent_to_child);
+
         PaddedPODArray<UInt64> keys = {0, 1, 2, 3, 4};
 
         {
             size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
-                parent_to_child,
+                *parent_to_child_index,
                 DB::detail::GetAllDescendantsStrategy(),
                 keys_found);
 
@@ -175,7 +177,7 @@ TEST(HierarchyDictionariesUtils, getDescendants)
             size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
-                parent_to_child,
+                *parent_to_child_index,
                 DB::detail::GetDescendantsAtSpecificLevelStrategy{1},
                 keys_found);
 
@@ -195,13 +197,15 @@ TEST(HierarchyDictionariesUtils, getDescendants)
         parent_to_child[1].emplace_back(2);
         parent_to_child[2].emplace_back(1);
 
+        auto parent_to_child_index = std::make_shared<DictionaryHierarchicalParentToChildIndex>(parent_to_child);
+
         PaddedPODArray<UInt64> keys = {1, 2, 3};
 
         {
             size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
-                parent_to_child,
+                *parent_to_child_index,
                 DB::detail::GetAllDescendantsStrategy(),
                 keys_found);
 
@@ -219,7 +223,7 @@ TEST(HierarchyDictionariesUtils, getDescendants)
             size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
-                parent_to_child,
+                *parent_to_child_index,
                 DB::detail::GetDescendantsAtSpecificLevelStrategy{1},
                 keys_found);
 
diff --git a/src/Disks/AzureBlobStorage/AzureBlobStorageAuth.h b/src/Disks/AzureBlobStorage/AzureBlobStorageAuth.h
deleted file mode 100644
index 048daa7c9dc..00000000000
--- a/src/Disks/AzureBlobStorage/AzureBlobStorageAuth.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <Common/config.h>
-
-#if USE_AZURE_BLOB_STORAGE
-
-#include <Disks/IDiskRemote.h>
-#include <azure/storage/blobs.hpp>
-
-namespace DB
-{
-
-std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> getAzureBlobContainerClient(
-    const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
-
-}
-
-#endif
diff --git a/src/Disks/AzureBlobStorage/DiskAzureBlobStorage.cpp b/src/Disks/AzureBlobStorage/DiskAzureBlobStorage.cpp
deleted file mode 100644
index 556c28bd3f4..00000000000
--- a/src/Disks/AzureBlobStorage/DiskAzureBlobStorage.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-#include <Disks/AzureBlobStorage/DiskAzureBlobStorage.h>
-
-#if USE_AZURE_BLOB_STORAGE
-
-#include <Disks/RemoteDisksCommon.h>
-#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
-#include <Common/getRandomASCIIString.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int AZURE_BLOB_STORAGE_ERROR;
-}
-
-
-DiskAzureBlobStorageSettings::DiskAzureBlobStorageSettings(
-    UInt64 max_single_part_upload_size_,
-    UInt64 min_bytes_for_seek_,
-    int max_single_read_retries_,
-    int max_single_download_retries_,
-    int thread_pool_size_) :
-    max_single_part_upload_size(max_single_part_upload_size_),
-    min_bytes_for_seek(min_bytes_for_seek_),
-    max_single_read_retries(max_single_read_retries_),
-    max_single_download_retries(max_single_download_retries_),
-    thread_pool_size(thread_pool_size_) {}
-
-
-DiskAzureBlobStorage::DiskAzureBlobStorage(
-    const String & name_,
-    DiskPtr metadata_disk_,
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
-    SettingsPtr settings_,
-    GetDiskSettings settings_getter_) :
-    IDiskRemote(name_, "", metadata_disk_, nullptr, "DiskAzureBlobStorage", settings_->thread_pool_size),
-    blob_container_client(blob_container_client_),
-    current_settings(std::move(settings_)),
-    settings_getter(settings_getter_) {}
-
-
-std::unique_ptr<ReadBufferFromFileBase> DiskAzureBlobStorage::readFile(
-    const String & path,
-    const ReadSettings & read_settings,
-    std::optional<size_t>,
-    std::optional<size_t>) const
-{
-    auto settings = current_settings.get();
-    auto metadata = readMetadata(path);
-
-    LOG_TEST(log, "Read from file by path: {}", backQuote(metadata_disk->getPath() + path));
-
-    auto reader_impl = std::make_unique<ReadBufferFromAzureBlobStorageGather>(
-        blob_container_client, metadata.remote_fs_root_path, metadata.remote_fs_objects,
-        settings->max_single_read_retries, settings->max_single_download_retries, read_settings);
-
-    if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
-    {
-        auto reader = getThreadPoolReader();
-        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(reader_impl));
-    }
-    else
-    {
-        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(reader_impl));
-        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), current_settings.get()->min_bytes_for_seek);
-    }
-}
-
-
-std::unique_ptr<WriteBufferFromFileBase> DiskAzureBlobStorage::writeFile(
-    const String & path,
-    size_t buf_size,
-    WriteMode mode,
-    const WriteSettings &)
-{
-    auto blob_path = path + "_" + getRandomASCIIString(8); /// NOTE: path contains the tmp_* prefix in the blob name
-
-    LOG_TRACE(log, "{} to file by path: {}. AzureBlob Storage path: {}",
-        mode == WriteMode::Rewrite ? "Write" : "Append", backQuote(metadata_disk->getPath() + path), blob_path);
-
-    auto buffer = std::make_unique<WriteBufferFromAzureBlobStorage>(
-        blob_container_client,
-        blob_path,
-        current_settings.get()->max_single_part_upload_size,
-        buf_size);
-
-    auto create_metadata_callback = [this, path, mode, blob_path] (size_t count)
-    {
-        readOrCreateUpdateAndStoreMetadata(path, mode, false, [blob_path, count] (Metadata & metadata) { metadata.addObject(blob_path, count); return true; });
-    };
-
-    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(buffer), std::move(create_metadata_callback), blob_path);
-}
-
-
-DiskType DiskAzureBlobStorage::getType() const
-{
-    return DiskType::AzureBlobStorage;
-}
-
-
-bool DiskAzureBlobStorage::isRemote() const
-{
-    return true;
-}
-
-
-bool DiskAzureBlobStorage::supportZeroCopyReplication() const
-{
-    return true;
-}
-
-
-bool DiskAzureBlobStorage::checkUniqueId(const String & id) const
-{
-    Azure::Storage::Blobs::ListBlobsOptions blobs_list_options;
-    blobs_list_options.Prefix = id;
-    blobs_list_options.PageSizeHint = 1;
-
-    auto blobs_list_response = blob_container_client->ListBlobs(blobs_list_options);
-    auto blobs_list = blobs_list_response.Blobs;
-
-    for (const auto & blob : blobs_list)
-    {
-        if (id == blob.Name)
-            return true;
-    }
-
-    return false;
-}
-
-
-void DiskAzureBlobStorage::removeFromRemoteFS(const std::vector<String> & paths)
-{
-    for (const auto & path : paths)
-    {
-        try
-        {
-            auto delete_info = blob_container_client->DeleteBlob(path);
-            if (!delete_info.Value.Deleted)
-                throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Failed to delete file in AzureBlob Storage: {}", path);
-        }
-        catch (const Azure::Storage::StorageException & e)
-        {
-            LOG_INFO(log, "Caught an error while deleting file {} : {}", path, e.Message);
-            throw;
-        }
-    }
-}
-
-void DiskAzureBlobStorage::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String &, const DisksMap &)
-{
-    auto new_settings = settings_getter(config, "storage_configuration.disks." + name, context);
-
-    current_settings.set(std::move(new_settings));
-
-    if (AsyncExecutor * exec = dynamic_cast<AsyncExecutor*>(&getExecutor()))
-        exec->setMaxThreads(current_settings.get()->thread_pool_size);
-}
-
-}
-
-#endif
diff --git a/src/Disks/AzureBlobStorage/DiskAzureBlobStorage.h b/src/Disks/AzureBlobStorage/DiskAzureBlobStorage.h
deleted file mode 100644
index ff99e246d31..00000000000
--- a/src/Disks/AzureBlobStorage/DiskAzureBlobStorage.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <Common/config.h>
-
-#if USE_AZURE_BLOB_STORAGE
-
-#include <Disks/IDiskRemote.h>
-#include <IO/ReadBufferFromAzureBlobStorage.h>
-#include <IO/WriteBufferFromAzureBlobStorage.h>
-#include <IO/SeekAvoidingReadBuffer.h>
-
-#include <azure/identity/managed_identity_credential.hpp>
-#include <azure/storage/blobs.hpp>
-
-
-namespace DB
-{
-
-struct DiskAzureBlobStorageSettings final
-{
-    DiskAzureBlobStorageSettings(
-        UInt64 max_single_part_upload_size_,
-        UInt64 min_bytes_for_seek_,
-        int max_single_read_retries,
-        int max_single_download_retries,
-        int thread_pool_size_);
-
-    size_t max_single_part_upload_size; /// NOTE: on 32-bit machines it will be at most 4GB, but size_t is also used in BufferBase for offset
-    UInt64 min_bytes_for_seek;
-    size_t max_single_read_retries;
-    size_t max_single_download_retries;
-    size_t thread_pool_size;
-};
-
-
-class DiskAzureBlobStorage final : public IDiskRemote
-{
-public:
-
-    using SettingsPtr = std::unique_ptr<DiskAzureBlobStorageSettings>;
-    using GetDiskSettings = std::function<SettingsPtr(const Poco::Util::AbstractConfiguration &, const String, ContextPtr)>;
-
-    DiskAzureBlobStorage(
-        const String & name_,
-        DiskPtr metadata_disk_,
-        std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
-        SettingsPtr settings_,
-        GetDiskSettings settings_getter_);
-
-    std::unique_ptr<ReadBufferFromFileBase> readFile(
-        const String & path,
-        const ReadSettings & settings,
-        std::optional<size_t> read_hint,
-        std::optional<size_t> file_size) const override;
-
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(
-        const String & path,
-        size_t buf_size,
-        WriteMode mode,
-        const WriteSettings & settings) override;
-
-    DiskType getType() const override;
-
-    bool isRemote() const override;
-
-    bool supportZeroCopyReplication() const override;
-
-    bool checkUniqueId(const String & id) const override;
-
-    void removeFromRemoteFS(const std::vector<String> & paths) override;
-
-    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String &, const DisksMap &) override;
-
-private:
-
-    /// client used to access the files in the Blob Storage cloud
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
-
-    MultiVersion<DiskAzureBlobStorageSettings> current_settings;
-    /// Gets disk settings from context.
-    GetDiskSettings settings_getter;
-};
-
-}
-
-#endif
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 80cfc23d210..02babfbb59f 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -211,9 +211,9 @@ void DiskDecorator::shutdown()
     delegate->shutdown();
 }
 
-void DiskDecorator::startup()
+void DiskDecorator::startup(ContextPtr context)
 {
-    delegate->startup();
+    delegate->startup(context);
 }
 
 void DiskDecorator::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String & config_prefix, const DisksMap & map)
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index 325d8b6704b..883e58f9c8c 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -71,7 +71,7 @@ public:
     void onFreeze(const String & path) override;
     SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
     void shutdown() override;
-    void startup() override;
+    void startup(ContextPtr context) override;
     void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String & config_prefix, const DisksMap & map) override;
     String getCacheBasePath() const override { return delegate->getCacheBasePath(); }
     std::vector<String> getRemotePaths(const String & path) const override { return delegate->getRemotePaths(path); }
@@ -83,6 +83,9 @@ public:
 
     UInt32 getRefCount(const String & path) const override { return delegate->getRefCount(path); }
 
+    void syncRevision(UInt64 revision) override { delegate->syncRevision(revision); }
+    UInt64 getRevision() const override { return delegate->getRevision(); }
+
 protected:
     Executor & getExecutor() override;
 
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index e8e9867f4df..85de683b431 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -494,7 +494,7 @@ DiskLocal::DiskLocal(
         disk_checker = std::make_unique<DiskLocalCheckThread>(this, context, local_disk_check_period_ms);
 }
 
-void DiskLocal::startup()
+void DiskLocal::startup(ContextPtr)
 {
     try
     {
@@ -682,7 +682,7 @@ void registerDiskLocal(DiskFactory & factory)
 
         std::shared_ptr<IDisk> disk
             = std::make_shared<DiskLocal>(name, path, keep_free_space_bytes, context, config.getUInt("local_disk_check_period_ms", 0));
-        disk->startup();
+        disk->startup(context);
         return std::make_shared<DiskRestartProxy>(disk);
     };
     factory.registerDiskType("local", creator);
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 62b03e7b2ed..cb3356ab7f2 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -110,7 +110,7 @@ public:
 
     bool isBroken() const override { return broken; }
 
-    void startup() override;
+    void startup(ContextPtr) override;
 
     void shutdown() override;
 
diff --git a/src/Disks/DiskRestartProxy.cpp b/src/Disks/DiskRestartProxy.cpp
index fab4e2148ca..bf97c2cfe49 100644
--- a/src/Disks/DiskRestartProxy.cpp
+++ b/src/Disks/DiskRestartProxy.cpp
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int DEADLOCK_AVOIDED;
@@ -329,7 +330,7 @@ void DiskRestartProxy::getRemotePathsRecursive(const String & path, std::vector<
     return DiskDecorator::getRemotePathsRecursive(path, paths_map);
 }
 
-void DiskRestartProxy::restart()
+void DiskRestartProxy::restart(ContextPtr context)
 {
     /// Speed up processing unhealthy requests.
     DiskDecorator::shutdown();
@@ -352,7 +353,7 @@ void DiskRestartProxy::restart()
 
     LOG_INFO(log, "Restart lock acquired. Restarting disk {}", DiskDecorator::getName());
 
-    DiskDecorator::startup();
+    DiskDecorator::startup(context);
 
     LOG_INFO(log, "Disk restarted {}", DiskDecorator::getName());
 }
diff --git a/src/Disks/DiskRestartProxy.h b/src/Disks/DiskRestartProxy.h
index d30c2fdbbfb..084e06e3f18 100644
--- a/src/Disks/DiskRestartProxy.h
+++ b/src/Disks/DiskRestartProxy.h
@@ -68,7 +68,7 @@ public:
     std::vector<String> getRemotePaths(const String & path) const override;
     void getRemotePathsRecursive(const String & path, std::vector<LocalPathWithRemotePaths> & paths_map) override;
 
-    void restart();
+    void restart(ContextPtr context);
 
 private:
     friend class RestartAwareReadBuffer;
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 576ded94b01..b8a0d12d6c1 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -9,8 +9,12 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <Disks/IDiskRemote.h>
+#include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <IO/ReadBufferFromFile.h>
+
 #include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+
 #include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
@@ -173,7 +177,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
 
     if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
     {
-        auto reader = IDiskRemote::getThreadPoolReader();
+        auto reader = IObjectStorage::getThreadPoolReader();
         return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(web_impl), min_bytes_for_seek);
     }
     else
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index dd699921f7c..47042fabc3d 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -1,10 +1,13 @@
 #pragma once
 
-#include <Disks/IDiskRemote.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Core/UUID.h>
 #include <set>
 
+#include <Interpreters/Context_fwd.h>
+#include <Disks/IDisk.h>
+#include <IO/ReadBufferFromFile.h>
+
 
 namespace DB
 {
diff --git a/src/Disks/HDFS/DiskHDFS.cpp b/src/Disks/HDFS/DiskHDFS.cpp
deleted file mode 100644
index b8e482f623c..00000000000
--- a/src/Disks/HDFS/DiskHDFS.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <Disks/HDFS/DiskHDFS.h>
-
-#if USE_HDFS
-
-#include <Disks/DiskLocal.h>
-#include <Disks/RemoteDisksCommon.h>
-
-#include <IO/SeekAvoidingReadBuffer.h>
-#include <Storages/HDFS/WriteBufferFromHDFS.h>
-#include <Storages/HDFS/HDFSCommon.h>
-
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <Common/logger_useful.h>
-#include <base/FnTraits.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
-}
-
-
-DiskHDFS::DiskHDFS(
-    const String & disk_name_,
-    const String & hdfs_root_path_,
-    SettingsPtr settings_,
-    DiskPtr metadata_disk_,
-    const Poco::Util::AbstractConfiguration & config_)
-    : IDiskRemote(disk_name_, hdfs_root_path_, metadata_disk_, nullptr, "DiskHDFS", settings_->thread_pool_size)
-    , config(config_)
-    , hdfs_builder(createHDFSBuilder(hdfs_root_path_, config))
-    , hdfs_fs(createHDFSFS(hdfs_builder.get()))
-    , settings(std::move(settings_))
-{
-}
-
-
-std::unique_ptr<ReadBufferFromFileBase> DiskHDFS::readFile(const String & path, const ReadSettings & read_settings, std::optional<size_t>, std::optional<size_t>) const
-{
-    auto metadata = readMetadata(path);
-
-    LOG_TEST(log,
-        "Read from file by path: {}. Existing HDFS objects: {}",
-        backQuote(metadata_disk->getPath() + path), metadata.remote_fs_objects.size());
-
-    auto hdfs_impl = std::make_unique<ReadBufferFromHDFSGather>(config, remote_fs_root_path, remote_fs_root_path, metadata.remote_fs_objects, read_settings);
-    auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(hdfs_impl));
-    return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings->min_bytes_for_seek);
-}
-
-
-std::unique_ptr<WriteBufferFromFileBase> DiskHDFS::writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings &)
-{
-    /// Path to store new HDFS object.
-    std::string file_name = getRandomName();
-    std::string hdfs_path = fs::path(remote_fs_root_path) / file_name;
-
-    LOG_TRACE(log, "{} to file by path: {}. HDFS path: {}", mode == WriteMode::Rewrite ? "Write" : "Append",
-              backQuote(metadata_disk->getPath() + path), hdfs_path);
-
-    /// Single O_WRONLY in libhdfs adds O_TRUNC
-    auto hdfs_buffer = std::make_unique<WriteBufferFromHDFS>(hdfs_path,
-                                                             config, settings->replication, buf_size,
-                                                             mode == WriteMode::Rewrite ? O_WRONLY :  O_WRONLY | O_APPEND);
-    auto create_metadata_callback = [this, path, mode, file_name] (size_t count)
-    {
-        readOrCreateUpdateAndStoreMetadata(path, mode, false, [file_name, count] (Metadata & metadata) { metadata.addObject(file_name, count); return true; });
-    };
-
-    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(hdfs_buffer), std::move(create_metadata_callback), hdfs_path);
-}
-
-void DiskHDFS::removeFromRemoteFS(const std::vector<String> & paths)
-{
-    for (const auto & hdfs_path : paths)
-    {
-        const size_t begin_of_path = hdfs_path.find('/', hdfs_path.find("//") + 2);
-
-        /// Add path from root to file name
-        int res = hdfsDelete(hdfs_fs.get(), hdfs_path.substr(begin_of_path).c_str(), 0);
-        if (res == -1)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "HDFSDelete failed with path: " + hdfs_path);
-    }
-}
-
-bool DiskHDFS::checkUniqueId(const String & hdfs_uri) const
-{
-    if (!boost::algorithm::starts_with(hdfs_uri, remote_fs_root_path))
-        return false;
-    const size_t begin_of_path = hdfs_uri.find('/', hdfs_uri.find("//") + 2);
-    const String remote_fs_object_path = hdfs_uri.substr(begin_of_path);
-    return (0 == hdfsExists(hdfs_fs.get(), remote_fs_object_path.c_str()));
-}
-
-namespace
-{
-std::unique_ptr<DiskHDFSSettings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Settings & settings)
-{
-    return std::make_unique<DiskHDFSSettings>(
-        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-        config.getInt(config_prefix + ".thread_pool_size", 16),
-        config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000),
-        settings.hdfs_replication);
-}
-}
-
-void registerDiskHDFS(DiskFactory & factory)
-{
-    auto creator = [](const String & name,
-                      const Poco::Util::AbstractConfiguration & config,
-                      const String & config_prefix,
-                      ContextPtr context_,
-                      const DisksMap & /*map*/) -> DiskPtr
-    {
-        String uri{config.getString(config_prefix + ".endpoint")};
-        checkHDFSURL(uri);
-
-        if (uri.back() != '/')
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "HDFS path must ends with '/', but '{}' doesn't.", uri);
-
-        auto metadata_disk = prepareForLocalMetadata(name, config, config_prefix, context_).second;
-
-        return std::make_shared<DiskHDFS>(
-            name, uri,
-            getSettings(config, config_prefix, context_->getSettingsRef()),
-            metadata_disk, config);
-    };
-
-    factory.registerDiskType("hdfs", creator);
-}
-
-}
-#endif
diff --git a/src/Disks/HDFS/DiskHDFS.h b/src/Disks/HDFS/DiskHDFS.h
deleted file mode 100644
index 5c6e011dc96..00000000000
--- a/src/Disks/HDFS/DiskHDFS.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <Common/config.h>
-
-#if USE_HDFS
-
-#include <Disks/IDiskRemote.h>
-#include <Storages/HDFS/HDFSCommon.h>
-#include <Core/UUID.h>
-#include <memory>
-
-
-namespace DB
-{
-
-struct DiskHDFSSettings
-{
-    size_t min_bytes_for_seek;
-    int thread_pool_size;
-    int objects_chunk_size_to_delete;
-    int replication;
-
-    DiskHDFSSettings(
-            int min_bytes_for_seek_,
-            int thread_pool_size_,
-            int objects_chunk_size_to_delete_,
-            int replication_)
-        : min_bytes_for_seek(min_bytes_for_seek_)
-        , thread_pool_size(thread_pool_size_)
-        , objects_chunk_size_to_delete(objects_chunk_size_to_delete_)
-        , replication(replication_) {}
-};
-
-
-/**
- * Storage for persisting data in HDFS and metadata on the local disk.
- * Files are represented by file in local filesystem (clickhouse_root/disks/disk_name/path/to/file)
- * that contains HDFS object key with actual data.
- */
-class DiskHDFS final : public IDiskRemote
-{
-public:
-    using SettingsPtr = std::unique_ptr<DiskHDFSSettings>;
-
-    DiskHDFS(
-        const String & disk_name_,
-        const String & hdfs_root_path_,
-        SettingsPtr settings_,
-        DiskPtr metadata_disk_,
-        const Poco::Util::AbstractConfiguration & config_);
-
-    DiskType getType() const override { return DiskType::HDFS; }
-    bool isRemote() const override { return true; }
-
-    bool supportZeroCopyReplication() const override { return true; }
-
-    std::unique_ptr<ReadBufferFromFileBase> readFile(
-        const String & path,
-        const ReadSettings & settings,
-        std::optional<size_t> read_hint,
-        std::optional<size_t> file_size) const override;
-
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings & settings) override;
-
-    void removeFromRemoteFS(const std::vector<String> & paths) override;
-
-    /// Check file exists and ClickHouse has an access to it
-    /// Overrode in remote disk
-    /// Required for remote disk to ensure that replica has access to data written by other node
-    bool checkUniqueId(const String & hdfs_uri) const override;
-
-private:
-    String getRandomName() { return toString(UUIDHelpers::generateV4()); }
-
-    const Poco::Util::AbstractConfiguration & config;
-
-    HDFSBuilderWrapper hdfs_builder;
-    HDFSFSPtr hdfs_fs;
-
-    SettingsPtr settings;
-};
-
-}
-#endif
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 440cf31682d..f243f477f2c 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -10,6 +10,8 @@
 #include <Disks/DiskType.h>
 #include <IO/ReadSettings.h>
 #include <IO/WriteSettings.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Disks/WriteMode.h>
 
 #include <memory>
 #include <mutex>
@@ -48,14 +50,6 @@ class ReadBufferFromFileBase;
 class WriteBufferFromFileBase;
 class MMappedFileCache;
 
-/**
- * Mode of opening a file for write.
- */
-enum class WriteMode
-{
-    Rewrite,
-    Append
-};
 
 /**
  * Provide interface for reservation.
@@ -289,14 +283,14 @@ public:
 
     virtual bool isReadOnly() const { return false; }
 
-    /// Check if disk is broken. Broken disks will have 0 space and not be used.
+    /// Check if disk is broken. Broken disks will have 0 space and cannot be used.
     virtual bool isBroken() const { return false; }
 
     /// Invoked when Global Context is shutdown.
     virtual void shutdown() {}
 
     /// Performs action on disk startup.
-    virtual void startup() {}
+    virtual void startup(ContextPtr) {}
 
     /// Return some uniq string for file, overrode for IDiskRemote
     /// Required for distinguish different copies of the same part on remote disk
@@ -343,6 +337,14 @@ public:
     /// other alive harlinks will not be removed.
     virtual UInt32 getRefCount(const String &) const { return 0; }
 
+    /// Revision is an incremental counter of disk operation.
+    /// Revision currently exisis only in DiskS3.
+    /// It is used to save current state during backup and restore that state from backup.
+    /// This method sets current disk revision if it lower than required.
+    virtual void syncRevision(UInt64) {}
+    /// Return current disk revision.
+    virtual UInt64 getRevision() const { return 0; }
+
 
 protected:
     friend class DiskDecorator;
diff --git a/src/Disks/IDiskRemote.cpp b/src/Disks/IDiskRemote.cpp
deleted file mode 100644
index 00d36bcc624..00000000000
--- a/src/Disks/IDiskRemote.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-#include <Disks/IDiskRemote.h>
-
-#include "Disks/DiskFactory.h"
-#include <IO/ReadBufferFromFile.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteBufferFromFile.h>
-#include <IO/WriteHelpers.h>
-#include <Common/createHardLink.h>
-#include <Common/quoteString.h>
-#include <Common/logger_useful.h>
-#include <Common/checkStackSize.h>
-#include <boost/algorithm/string.hpp>
-#include <Common/filesystemHelpers.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
-#include <Common/FileCache.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int INCORRECT_DISK_INDEX;
-    extern const int UNKNOWN_FORMAT;
-    extern const int FILE_ALREADY_EXISTS;
-    extern const int PATH_ACCESS_DENIED;
-    extern const int FILE_DOESNT_EXIST;
-    extern const int BAD_FILE_TYPE;
-}
-
-
-IDiskRemote::Metadata IDiskRemote::Metadata::readMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_)
-{
-    Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
-    result.load();
-    return result;
-}
-
-
-IDiskRemote::Metadata IDiskRemote::Metadata::createAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync)
-{
-    Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
-    result.save(sync);
-    return result;
-}
-
-IDiskRemote::Metadata IDiskRemote::Metadata::readUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
-    result.load();
-    if (updater(result))
-        result.save(sync);
-    return result;
-}
-
-IDiskRemote::Metadata IDiskRemote::Metadata::createUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
-    updater(result);
-    result.save(sync);
-    return result;
-}
-
-IDiskRemote::Metadata IDiskRemote::Metadata::readUpdateStoreMetadataAndRemove(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
-    result.load();
-    if (updater(result))
-        result.save(sync);
-    metadata_disk_->removeFile(metadata_file_path_);
-
-    return result;
-
-}
-
-IDiskRemote::Metadata IDiskRemote::Metadata::createAndStoreMetadataIfNotExists(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, bool overwrite)
-{
-    if (overwrite || !metadata_disk_->exists(metadata_file_path_))
-    {
-        return createAndStoreMetadata(remote_fs_root_path_, metadata_disk_, metadata_file_path_, sync);
-    }
-    else
-    {
-        auto result = readMetadata(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
-        if (result.read_only)
-            throw Exception("File is read-only: " + metadata_file_path_, ErrorCodes::PATH_ACCESS_DENIED);
-        return result;
-    }
-}
-
-void IDiskRemote::Metadata::load()
-{
-    const ReadSettings read_settings;
-    auto buf = metadata_disk->readFile(metadata_file_path, read_settings, 1024);  /* reasonable buffer size for small file */
-
-    UInt32 version;
-    readIntText(version, *buf);
-
-    if (version < VERSION_ABSOLUTE_PATHS || version > VERSION_READ_ONLY_FLAG)
-        throw Exception(
-            ErrorCodes::UNKNOWN_FORMAT,
-            "Unknown metadata file version. Path: {}. Version: {}. Maximum expected version: {}",
-            metadata_disk->getPath() + metadata_file_path, toString(version), toString(VERSION_READ_ONLY_FLAG));
-
-    assertChar('\n', *buf);
-
-    UInt32 remote_fs_objects_count;
-    readIntText(remote_fs_objects_count, *buf);
-    assertChar('\t', *buf);
-    readIntText(total_size, *buf);
-    assertChar('\n', *buf);
-    remote_fs_objects.resize(remote_fs_objects_count);
-
-    for (size_t i = 0; i < remote_fs_objects_count; ++i)
-    {
-        String remote_fs_object_path;
-        size_t remote_fs_object_size;
-        readIntText(remote_fs_object_size, *buf);
-        assertChar('\t', *buf);
-        readEscapedString(remote_fs_object_path, *buf);
-        if (version == VERSION_ABSOLUTE_PATHS)
-        {
-            if (!remote_fs_object_path.starts_with(remote_fs_root_path))
-                throw Exception(ErrorCodes::UNKNOWN_FORMAT,
-                    "Path in metadata does not correspond to root path. Path: {}, root path: {}, disk path: {}",
-                    remote_fs_object_path, remote_fs_root_path, metadata_disk->getPath());
-
-            remote_fs_object_path = remote_fs_object_path.substr(remote_fs_root_path.size());
-        }
-        assertChar('\n', *buf);
-        remote_fs_objects[i].relative_path = remote_fs_object_path;
-        remote_fs_objects[i].bytes_size = remote_fs_object_size;
-    }
-
-    readIntText(ref_count, *buf);
-    assertChar('\n', *buf);
-
-    if (version >= VERSION_READ_ONLY_FLAG)
-    {
-        readBoolText(read_only, *buf);
-        assertChar('\n', *buf);
-    }
-}
-
-/// Load metadata by path or create empty if `create` flag is set.
-IDiskRemote::Metadata::Metadata(
-        const String & remote_fs_root_path_,
-        DiskPtr metadata_disk_,
-        const String & metadata_file_path_)
-    : remote_fs_root_path(remote_fs_root_path_)
-    , metadata_file_path(metadata_file_path_)
-    , metadata_disk(metadata_disk_)
-{
-}
-
-void IDiskRemote::Metadata::addObject(const String & path, size_t size)
-{
-    total_size += size;
-    remote_fs_objects.emplace_back(path, size);
-}
-
-
-void IDiskRemote::Metadata::saveToBuffer(WriteBuffer & buf, bool sync)
-{
-    writeIntText(VERSION_RELATIVE_PATHS, buf);
-    writeChar('\n', buf);
-
-    writeIntText(remote_fs_objects.size(), buf);
-    writeChar('\t', buf);
-    writeIntText(total_size, buf);
-    writeChar('\n', buf);
-
-    for (const auto & [remote_fs_object_path, remote_fs_object_size] : remote_fs_objects)
-    {
-        writeIntText(remote_fs_object_size, buf);
-        writeChar('\t', buf);
-        writeEscapedString(remote_fs_object_path, buf);
-        writeChar('\n', buf);
-    }
-
-    writeIntText(ref_count, buf);
-    writeChar('\n', buf);
-
-    writeBoolText(read_only, buf);
-    writeChar('\n', buf);
-
-    buf.finalize();
-    if (sync)
-        buf.sync();
-
-}
-
-/// Fsync metadata file if 'sync' flag is set.
-void IDiskRemote::Metadata::save(bool sync)
-{
-    auto buf = metadata_disk->writeFile(metadata_file_path, 1024);
-    saveToBuffer(*buf, sync);
-}
-
-std::string IDiskRemote::Metadata::serializeToString()
-{
-    WriteBufferFromOwnString write_buf;
-    saveToBuffer(write_buf, false);
-    return write_buf.str();
-}
-
-IDiskRemote::Metadata IDiskRemote::readMetadataUnlocked(const String & path, std::shared_lock<std::shared_mutex> &) const
-{
-    return Metadata::readMetadata(remote_fs_root_path, metadata_disk, path);
-}
-
-
-IDiskRemote::Metadata IDiskRemote::readMetadata(const String & path) const
-{
-    std::shared_lock lock(metadata_mutex);
-    return readMetadataUnlocked(path, lock);
-}
-
-IDiskRemote::Metadata IDiskRemote::readUpdateAndStoreMetadata(const String & path, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    std::unique_lock lock(metadata_mutex);
-    return Metadata::readUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
-}
-
-
-IDiskRemote::Metadata IDiskRemote::readUpdateStoreMetadataAndRemove(const String & path, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    std::unique_lock lock(metadata_mutex);
-    return Metadata::readUpdateStoreMetadataAndRemove(remote_fs_root_path, metadata_disk, path, sync, updater);
-}
-
-IDiskRemote::Metadata IDiskRemote::readOrCreateUpdateAndStoreMetadata(const String & path, WriteMode mode, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    if (mode == WriteMode::Rewrite || !metadata_disk->exists(path))
-    {
-        std::unique_lock lock(metadata_mutex);
-        return Metadata::createUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
-    }
-    else
-    {
-        return Metadata::readUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
-    }
-}
-
-IDiskRemote::Metadata IDiskRemote::createAndStoreMetadata(const String & path, bool sync)
-{
-    return Metadata::createAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync);
-}
-
-IDiskRemote::Metadata IDiskRemote::createUpdateAndStoreMetadata(const String & path, bool sync, IDiskRemote::MetadataUpdater updater)
-{
-    return Metadata::createUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
-}
-
-
-std::unordered_map<String, String> IDiskRemote::getSerializedMetadata(const std::vector<std::string> & file_paths) const
-{
-    std::unordered_map<String, String> metadatas;
-
-    std::shared_lock lock(metadata_mutex);
-
-    for (const auto & path : file_paths)
-    {
-        IDiskRemote::Metadata metadata = readMetadataUnlocked(path, lock);
-        metadata.ref_count = 0;
-        metadatas[path] = metadata.serializeToString();
-    }
-
-    return metadatas;
-}
-
-void IDiskRemote::removeMetadata(const String & path, std::vector<String> & paths_to_remove)
-{
-    LOG_TRACE(log, "Remove file by path: {}", backQuote(metadata_disk->getPath() + path));
-
-    if (!metadata_disk->exists(path))
-        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Metadata path '{}' doesn't exist", path);
-
-    if (!metadata_disk->isFile(path))
-        throw Exception(ErrorCodes::BAD_FILE_TYPE, "Path '{}' is not a regular file", path);
-
-    try
-    {
-        auto metadata_updater = [&paths_to_remove, this] (Metadata & metadata)
-        {
-            if (metadata.ref_count == 0)
-            {
-                for (const auto & [remote_fs_object_path, _] : metadata.remote_fs_objects)
-                {
-
-                    paths_to_remove.push_back(remote_fs_root_path + remote_fs_object_path);
-
-                    if (cache)
-                    {
-                        auto key = cache->hash(remote_fs_object_path);
-                        cache->remove(key);
-                    }
-                }
-
-                return false;
-            }
-            else /// In other case decrement number of references, save metadata and delete hardlink.
-            {
-                --metadata.ref_count;
-            }
-
-            return true;
-        };
-
-        readUpdateStoreMetadataAndRemove(path, false, metadata_updater);
-        /// If there is no references - delete content from remote FS.
-    }
-    catch (const Exception & e)
-    {
-        /// If it's impossible to read meta - just remove it from FS.
-        if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
-        {
-            LOG_WARNING(log,
-                "Metadata file {} can't be read by reason: {}. Removing it forcibly.",
-                backQuote(path), e.nested() ? e.nested()->message() : e.message());
-            metadata_disk->removeFile(path);
-        }
-        else
-            throw;
-    }
-}
-
-
-void IDiskRemote::removeMetadataRecursive(const String & path, std::unordered_map<String, std::vector<String>> & paths_to_remove)
-{
-    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
-
-    if (metadata_disk->isFile(path))
-    {
-        removeMetadata(path, paths_to_remove[path]);
-    }
-    else
-    {
-        for (auto it = iterateDirectory(path); it->isValid(); it->next())
-            removeMetadataRecursive(it->path(), paths_to_remove);
-
-        metadata_disk->removeDirectory(path);
-    }
-}
-
-std::vector<String> IDiskRemote::getRemotePaths(const String & local_path) const
-{
-    auto metadata = readMetadata(local_path);
-
-    std::vector<String> remote_paths;
-    for (const auto & [remote_path, _] : metadata.remote_fs_objects)
-        remote_paths.push_back(fs::path(metadata.remote_fs_root_path) / remote_path);
-
-    return remote_paths;
-}
-
-void IDiskRemote::getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithRemotePaths> & paths_map)
-{
-    /// Protect against concurrent delition of files (for example because of a merge).
-    if (metadata_disk->isFile(local_path))
-    {
-        try
-        {
-            paths_map.emplace_back(local_path, getRemotePaths(local_path));
-        }
-        catch (const Exception & e)
-        {
-            if (e.code() == ErrorCodes::FILE_DOESNT_EXIST)
-                return;
-            throw;
-        }
-    }
-    else
-    {
-        DiskDirectoryIteratorPtr it;
-        try
-        {
-            it = iterateDirectory(local_path);
-        }
-        catch (const fs::filesystem_error & e)
-        {
-            if (e.code() == std::errc::no_such_file_or_directory)
-                return;
-            throw;
-        }
-
-        for (; it->isValid(); it->next())
-            IDiskRemote::getRemotePathsRecursive(fs::path(local_path) / it->name(), paths_map);
-    }
-}
-
-DiskPtr DiskRemoteReservation::getDisk(size_t i) const
-{
-    if (i != 0)
-        throw Exception("Can't use i != 0 with single disk reservation", ErrorCodes::INCORRECT_DISK_INDEX);
-    return disk;
-}
-
-void DiskRemoteReservation::update(UInt64 new_size)
-{
-    std::lock_guard lock(disk->reservation_mutex);
-    disk->reserved_bytes -= size;
-    size = new_size;
-    disk->reserved_bytes += size;
-}
-
-
-DiskRemoteReservation::~DiskRemoteReservation()
-{
-    try
-    {
-        std::lock_guard lock(disk->reservation_mutex);
-        if (disk->reserved_bytes < size)
-        {
-            disk->reserved_bytes = 0;
-            LOG_ERROR(disk->log, "Unbalanced reservations size for disk '{}'.", disk->getName());
-        }
-        else
-        {
-            disk->reserved_bytes -= size;
-        }
-
-        if (disk->reservation_count == 0)
-            LOG_ERROR(disk->log, "Unbalanced reservation count for disk '{}'.", disk->getName());
-        else
-            --disk->reservation_count;
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-}
-
-
-IDiskRemote::IDiskRemote(
-    const String & name_,
-    const String & remote_fs_root_path_,
-    DiskPtr metadata_disk_,
-    FileCachePtr cache_,
-    const String & log_name_,
-    size_t thread_pool_size)
-    : IDisk(std::make_unique<AsyncExecutor>(log_name_, thread_pool_size))
-    , log(&Poco::Logger::get(log_name_))
-    , name(name_)
-    , remote_fs_root_path(remote_fs_root_path_)
-    , metadata_disk(metadata_disk_)
-    , cache(cache_)
-{
-}
-
-
-String IDiskRemote::getCacheBasePath() const
-{
-    return cache ? cache->getBasePath() : "";
-}
-
-
-bool IDiskRemote::exists(const String & path) const
-{
-    return metadata_disk->exists(path);
-}
-
-
-bool IDiskRemote::isFile(const String & path) const
-{
-    return metadata_disk->isFile(path);
-}
-
-
-void IDiskRemote::createFile(const String & path)
-{
-    createAndStoreMetadata(path, false);
-}
-
-
-size_t IDiskRemote::getFileSize(const String & path) const
-{
-    return readMetadata(path).total_size;
-}
-
-
-void IDiskRemote::moveFile(const String & from_path, const String & to_path)
-{
-    if (exists(to_path))
-        throw Exception("File already exists: " + to_path, ErrorCodes::FILE_ALREADY_EXISTS);
-
-    metadata_disk->moveFile(from_path, to_path);
-}
-
-
-void IDiskRemote::replaceFile(const String & from_path, const String & to_path)
-{
-    if (exists(to_path))
-    {
-        const String tmp_path = to_path + ".old";
-        moveFile(to_path, tmp_path);
-        moveFile(from_path, to_path);
-        removeFile(tmp_path);
-    }
-    else
-        moveFile(from_path, to_path);
-}
-
-void IDiskRemote::removeSharedFile(const String & path, bool delete_metadata_only)
-{
-    std::vector<String> paths_to_remove;
-    removeMetadata(path, paths_to_remove);
-
-    if (!delete_metadata_only)
-        removeFromRemoteFS(paths_to_remove);
-}
-
-void IDiskRemote::removeSharedFileIfExists(const String & path, bool delete_metadata_only)
-{
-    std::vector<String> paths_to_remove;
-    if (metadata_disk->exists(path))
-    {
-        removeMetadata(path, paths_to_remove);
-        if (!delete_metadata_only)
-            removeFromRemoteFS(paths_to_remove);
-    }
-}
-
-void IDiskRemote::removeSharedFiles(const RemoveBatchRequest & files, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only)
-{
-    std::unordered_map<String, std::vector<String>> paths_to_remove;
-    for (const auto & file : files)
-    {
-        bool skip = file.if_exists && !metadata_disk->exists(file.path);
-        if (!skip)
-            removeMetadata(file.path, paths_to_remove[file.path]);
-    }
-
-    if (!keep_all_batch_data)
-    {
-        std::vector<String> remove_from_remote;
-        for (auto && [path, remote_paths] : paths_to_remove)
-        {
-            if (!file_names_remove_metadata_only.contains(fs::path(path).filename()))
-                remove_from_remote.insert(remove_from_remote.end(), remote_paths.begin(), remote_paths.end());
-        }
-        removeFromRemoteFS(remove_from_remote);
-    }
-}
-
-void IDiskRemote::removeSharedRecursive(const String & path, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only)
-{
-    std::unordered_map<String, std::vector<String>> paths_to_remove;
-    removeMetadataRecursive(path, paths_to_remove);
-
-    if (!keep_all_batch_data)
-    {
-        std::vector<String> remove_from_remote;
-        for (auto && [local_path, remote_paths] : paths_to_remove)
-        {
-            if (!file_names_remove_metadata_only.contains(fs::path(local_path).filename()))
-                remove_from_remote.insert(remove_from_remote.end(), remote_paths.begin(), remote_paths.end());
-        }
-        removeFromRemoteFS(remove_from_remote);
-    }
-}
-
-
-void IDiskRemote::setReadOnly(const String & path)
-{
-    /// We should store read only flag inside metadata file (instead of using FS flag),
-    /// because we modify metadata file when create hard-links from it.
-    readUpdateAndStoreMetadata(path, false, [] (Metadata & metadata) { metadata.read_only = true; return true; });
-}
-
-
-bool IDiskRemote::isDirectory(const String & path) const
-{
-    return metadata_disk->isDirectory(path);
-}
-
-
-void IDiskRemote::createDirectory(const String & path)
-{
-    metadata_disk->createDirectory(path);
-}
-
-
-void IDiskRemote::createDirectories(const String & path)
-{
-    metadata_disk->createDirectories(path);
-}
-
-
-void IDiskRemote::clearDirectory(const String & path)
-{
-    for (auto it = iterateDirectory(path); it->isValid(); it->next())
-        if (isFile(it->path()))
-            removeFile(it->path());
-}
-
-
-void IDiskRemote::removeDirectory(const String & path)
-{
-    metadata_disk->removeDirectory(path);
-}
-
-
-DiskDirectoryIteratorPtr IDiskRemote::iterateDirectory(const String & path)
-{
-    return metadata_disk->iterateDirectory(path);
-}
-
-
-void IDiskRemote::listFiles(const String & path, std::vector<String> & file_names)
-{
-    for (auto it = iterateDirectory(path); it->isValid(); it->next())
-        file_names.push_back(it->name());
-}
-
-
-void IDiskRemote::setLastModified(const String & path, const Poco::Timestamp & timestamp)
-{
-    metadata_disk->setLastModified(path, timestamp);
-}
-
-
-Poco::Timestamp IDiskRemote::getLastModified(const String & path)
-{
-    return metadata_disk->getLastModified(path);
-}
-
-
-void IDiskRemote::createHardLink(const String & src_path, const String & dst_path)
-{
-    readUpdateAndStoreMetadata(src_path, false, [] (Metadata & metadata) { metadata.ref_count++; return true; });
-
-    /// Create FS hardlink to metadata file.
-    metadata_disk->createHardLink(src_path, dst_path);
-}
-
-
-ReservationPtr IDiskRemote::reserve(UInt64 bytes)
-{
-    auto unreserved_space = tryReserve(bytes);
-    if (!unreserved_space.has_value())
-        return {};
-
-    return std::make_unique<DiskRemoteReservation>(
-        std::static_pointer_cast<IDiskRemote>(shared_from_this()),
-        bytes, unreserved_space.value());
-}
-
-
-std::optional<UInt64> IDiskRemote::tryReserve(UInt64 bytes)
-{
-    std::lock_guard lock(reservation_mutex);
-
-    auto available_space = getAvailableSpace();
-    UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
-
-    if (bytes == 0)
-    {
-        LOG_TRACE(log, "Reserving 0 bytes on remote_fs disk {}", backQuote(name));
-        ++reservation_count;
-        return {unreserved_space};
-    }
-
-    if (unreserved_space >= bytes)
-    {
-        LOG_TRACE(log, "Reserving {} on disk {}, having unreserved {}.",
-            ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
-        ++reservation_count;
-        reserved_bytes += bytes;
-        return {unreserved_space - bytes};
-    }
-
-    return {};
-}
-
-String IDiskRemote::getUniqueId(const String & path) const
-{
-    LOG_TRACE(log, "Remote path: {}, Path: {}", remote_fs_root_path, path);
-    auto metadata = readMetadata(path);
-    String id;
-    if (!metadata.remote_fs_objects.empty())
-        id = metadata.remote_fs_root_path + metadata.remote_fs_objects[0].relative_path;
-    return id;
-}
-
-
-AsynchronousReaderPtr IDiskRemote::getThreadPoolReader()
-{
-    constexpr size_t pool_size = 50;
-    constexpr size_t queue_size = 1000000;
-    static AsynchronousReaderPtr reader = std::make_shared<ThreadPoolRemoteFSReader>(pool_size, queue_size);
-    return reader;
-}
-
-UInt32 IDiskRemote::getRefCount(const String & path) const
-{
-    return readMetadata(path).ref_count;
-}
-
-ThreadPool & IDiskRemote::getThreadPoolWriter()
-{
-    constexpr size_t pool_size = 100;
-    constexpr size_t queue_size = 1000000;
-    static ThreadPool writer(pool_size, pool_size, queue_size);
-    return writer;
-}
-
-}
diff --git a/src/Disks/IDiskRemote.h b/src/Disks/IDiskRemote.h
deleted file mode 100644
index 96da7dc4f23..00000000000
--- a/src/Disks/IDiskRemote.h
+++ /dev/null
@@ -1,325 +0,0 @@
-#pragma once
-
-#include <Common/config.h>
-
-#include <atomic>
-#include <Common/FileCache_fwd.h>
-#include <Disks/DiskFactory.h>
-#include <Disks/Executor.h>
-#include <utility>
-#include <mutex>
-#include <shared_mutex>
-#include <Common/MultiVersion.h>
-#include <Common/ThreadPool.h>
-#include <filesystem>
-
-namespace CurrentMetrics
-{
-    extern const Metric DiskSpaceReservedForMerge;
-}
-
-namespace DB
-{
-
-/// Path to blob with it's size
-struct BlobPathWithSize
-{
-    std::string relative_path;
-    uint64_t bytes_size;
-
-    BlobPathWithSize() = default;
-    BlobPathWithSize(const BlobPathWithSize & other) = default;
-
-    BlobPathWithSize(const std::string & relative_path_, uint64_t bytes_size_)
-        : relative_path(relative_path_)
-        , bytes_size(bytes_size_)
-    {}
-};
-
-/// List of blobs with their sizes
-using BlobsPathToSize = std::vector<BlobPathWithSize>;
-
-class IAsynchronousReader;
-using AsynchronousReaderPtr = std::shared_ptr<IAsynchronousReader>;
-
-
-/// Base Disk class for remote FS's, which are not posix-compatible (e.g. DiskS3, DiskHDFS, DiskBlobStorage)
-class IDiskRemote : public IDisk
-{
-
-friend class DiskRemoteReservation;
-
-public:
-    IDiskRemote(
-        const String & name_,
-        const String & remote_fs_root_path_,
-        DiskPtr metadata_disk_,
-        FileCachePtr cache_,
-        const String & log_name_,
-        size_t thread_pool_size);
-
-    struct Metadata;
-    using MetadataUpdater = std::function<bool(Metadata & metadata)>;
-
-    const String & getName() const final override { return name; }
-
-    const String & getPath() const final override { return metadata_disk->getPath(); }
-
-    String getCacheBasePath() const final override;
-
-    std::vector<String> getRemotePaths(const String & local_path) const final override;
-
-    void getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithRemotePaths> & paths_map) override;
-
-    /// Methods for working with metadata. For some operations (like hardlink
-    /// creation) metadata can be updated concurrently from multiple threads
-    /// (file actually rewritten on disk). So additional RW lock is required for
-    /// metadata read and write, but not for create new metadata.
-    Metadata readMetadata(const String & path) const;
-    Metadata readMetadataUnlocked(const String & path, std::shared_lock<std::shared_mutex> &) const;
-    Metadata readUpdateAndStoreMetadata(const String & path, bool sync, MetadataUpdater updater);
-    Metadata readUpdateStoreMetadataAndRemove(const String & path, bool sync, MetadataUpdater updater);
-
-    Metadata readOrCreateUpdateAndStoreMetadata(const String & path, WriteMode mode, bool sync, MetadataUpdater updater);
-
-    Metadata createAndStoreMetadata(const String & path, bool sync);
-    Metadata createUpdateAndStoreMetadata(const String & path, bool sync, MetadataUpdater updater);
-
-    UInt64 getTotalSpace() const override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getAvailableSpace() const override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getUnreservedSpace() const override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getKeepingFreeSpace() const override { return 0; }
-
-    bool exists(const String & path) const override;
-
-    bool isFile(const String & path) const override;
-
-    void createFile(const String & path) override;
-
-    size_t getFileSize(const String & path) const override;
-
-    void moveFile(const String & from_path, const String & to_path) override;
-
-    void replaceFile(const String & from_path, const String & to_path) override;
-
-    void removeFile(const String & path) override { removeSharedFile(path, false); }
-
-    void removeFileIfExists(const String & path) override { removeSharedFileIfExists(path, false); }
-
-    void removeRecursive(const String & path) override { removeSharedRecursive(path, false, {}); }
-
-
-    void removeSharedFile(const String & path, bool delete_metadata_only) override;
-
-    void removeSharedFileIfExists(const String & path, bool delete_metadata_only) override;
-
-    void removeSharedFiles(const RemoveBatchRequest & files, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override;
-
-    void removeSharedRecursive(const String & path, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override;
-
-    void listFiles(const String & path, std::vector<String> & file_names) override;
-
-    void setReadOnly(const String & path) override;
-
-    bool isDirectory(const String & path) const override;
-
-    void createDirectory(const String & path) override;
-
-    void createDirectories(const String & path) override;
-
-    void clearDirectory(const String & path) override;
-
-    void moveDirectory(const String & from_path, const String & to_path) override { moveFile(from_path, to_path); }
-
-    void removeDirectory(const String & path) override;
-
-    DiskDirectoryIteratorPtr iterateDirectory(const String & path) override;
-
-    void setLastModified(const String & path, const Poco::Timestamp & timestamp) override;
-
-    Poco::Timestamp getLastModified(const String & path) override;
-
-    void createHardLink(const String & src_path, const String & dst_path) override;
-
-    ReservationPtr reserve(UInt64 bytes) override;
-
-    String getUniqueId(const String & path) const override;
-
-    bool checkUniqueId(const String & id) const override = 0;
-
-    virtual void removeFromRemoteFS(const std::vector<String> & paths) = 0;
-
-    static AsynchronousReaderPtr getThreadPoolReader();
-    static ThreadPool & getThreadPoolWriter();
-
-    DiskPtr getMetadataDiskIfExistsOrSelf() override { return metadata_disk; }
-
-    UInt32 getRefCount(const String & path) const override;
-
-    /// Return metadata for each file path. Also, before serialization reset
-    /// ref_count for each metadata to zero. This function used only for remote
-    /// fetches/sends in replicated engines. That's why we reset ref_count to zero.
-    std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & file_paths) const override;
-protected:
-    Poco::Logger * log;
-    const String name;
-    const String remote_fs_root_path;
-
-    DiskPtr metadata_disk;
-
-    FileCachePtr cache;
-
-private:
-    void removeMetadata(const String & path, std::vector<String> & paths_to_remove);
-
-    void removeMetadataRecursive(const String & path, std::unordered_map<String, std::vector<String>> & paths_to_remove);
-
-    std::optional<UInt64> tryReserve(UInt64 bytes);
-
-    UInt64 reserved_bytes = 0;
-    UInt64 reservation_count = 0;
-    std::mutex reservation_mutex;
-    mutable std::shared_mutex metadata_mutex;
-};
-
-using RemoteDiskPtr = std::shared_ptr<IDiskRemote>;
-
-/// Remote FS (S3, HDFS) metadata file layout:
-/// FS objects, their number and total size of all FS objects.
-/// Each FS object represents a file path in remote FS and its size.
-
-struct IDiskRemote::Metadata
-{
-    using Updater = std::function<bool(IDiskRemote::Metadata & metadata)>;
-    /// Metadata file version.
-    static constexpr UInt32 VERSION_ABSOLUTE_PATHS = 1;
-    static constexpr UInt32 VERSION_RELATIVE_PATHS = 2;
-    static constexpr UInt32 VERSION_READ_ONLY_FLAG = 3;
-
-    /// Remote FS objects paths and their sizes.
-    std::vector<BlobPathWithSize> remote_fs_objects;
-
-    /// URI
-    const String & remote_fs_root_path;
-
-    /// Relative path to metadata file on local FS.
-    const String metadata_file_path;
-
-    DiskPtr metadata_disk;
-
-    /// Total size of all remote FS (S3, HDFS) objects.
-    size_t total_size = 0;
-
-    /// Number of references (hardlinks) to this metadata file.
-    ///
-    /// FIXME: Why we are tracking it explicetly, without
-    /// info from filesystem????
-    UInt32 ref_count = 0;
-
-    /// Flag indicates that file is read only.
-    bool read_only = false;
-
-    Metadata(
-        const String & remote_fs_root_path_,
-        DiskPtr metadata_disk_,
-        const String & metadata_file_path_);
-
-    void addObject(const String & path, size_t size);
-
-    static Metadata readMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_);
-    static Metadata readUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, Updater updater);
-    static Metadata readUpdateStoreMetadataAndRemove(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, Updater updater);
-
-    static Metadata createAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync);
-    static Metadata createUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, Updater updater);
-    static Metadata createAndStoreMetadataIfNotExists(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, bool overwrite);
-
-    /// Serialize metadata to string (very same with saveToBuffer)
-    std::string serializeToString();
-
-private:
-    /// Fsync metadata file if 'sync' flag is set.
-    void save(bool sync = false);
-    void saveToBuffer(WriteBuffer & buffer, bool sync);
-    void load();
-};
-
-class DiskRemoteReservation final : public IReservation
-{
-public:
-    DiskRemoteReservation(const RemoteDiskPtr & disk_, UInt64 size_, UInt64 unreserved_space_)
-        : disk(disk_)
-        , size(size_)
-        , unreserved_space(unreserved_space_)
-        , metric_increment(CurrentMetrics::DiskSpaceReservedForMerge, size_)
-    {
-    }
-
-    UInt64 getSize() const override { return size; }
-
-    UInt64 getUnreservedSpace() const override { return unreserved_space; }
-
-    DiskPtr getDisk(size_t i) const override;
-
-    Disks getDisks() const override { return {disk}; }
-
-    void update(UInt64 new_size) override;
-
-    ~DiskRemoteReservation() override;
-
-private:
-    RemoteDiskPtr disk;
-    UInt64 size;
-    UInt64 unreserved_space;
-    CurrentMetrics::Increment metric_increment;
-};
-
-
-/// Runs tasks asynchronously using thread pool.
-class AsyncExecutor : public Executor
-{
-public:
-    explicit AsyncExecutor(const String & name_, int thread_pool_size)
-        : name(name_)
-        , pool(ThreadPool(thread_pool_size)) {}
-
-    std::future<void> execute(std::function<void()> task) override
-    {
-        auto promise = std::make_shared<std::promise<void>>();
-        pool.scheduleOrThrowOnError(
-            [promise, task]()
-            {
-                try
-                {
-                    task();
-                    promise->set_value();
-                }
-                catch (...)
-                {
-                    tryLogCurrentException("Failed to run async task");
-
-                    try
-                    {
-                        promise->set_exception(std::current_exception());
-                    }
-                    catch (...) {}
-                }
-            });
-
-        return promise->get_future();
-    }
-
-    void setMaxThreads(size_t threads)
-    {
-        pool.setMaxThreads(threads);
-    }
-
-private:
-    String name;
-    ThreadPool pool;
-};
-
-}
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
index 1cb6354d38c..2e85c4eb34a 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
@@ -212,38 +212,6 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
                 read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
                 return getRemoteFSReadBuffer(file_segment, read_type);
             }
-            case FileSegment::State::EMPTY:
-            {
-                auto downloader_id = file_segment->getOrSetDownloader();
-                if (downloader_id == file_segment->getCallerId())
-                {
-                    if (file_offset_of_buffer_end == file_segment->getDownloadOffset())
-                    {
-                        read_type = ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
-                        return getRemoteFSReadBuffer(file_segment, read_type);
-                    }
-                    else
-                    {
-                        ///                      segment{k}
-                        /// cache:           [______|___________
-                        ///                         ^
-                        ///                         download_offset
-                        /// requested_range:            [__________]
-                        ///                             ^
-                        ///                             file_offset_of_buffer_end
-                        assert(file_offset_of_buffer_end > file_segment->getDownloadOffset());
-                        bytes_to_predownload = file_offset_of_buffer_end - file_segment->getDownloadOffset();
-
-                        read_type = ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
-                        return getRemoteFSReadBuffer(file_segment, read_type);
-                    }
-                }
-                else
-                {
-                    download_state = file_segment->state();
-                    continue;
-                }
-            }
             case FileSegment::State::DOWNLOADING:
             {
                 size_t download_offset = file_segment->getDownloadOffset();
@@ -280,6 +248,7 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
                 read_type = ReadType::CACHED;
                 return getCacheReadBuffer(range.left);
             }
+            case FileSegment::State::EMPTY:
             case FileSegment::State::PARTIALLY_DOWNLOADED:
             {
                 if (file_segment->getDownloadOffset() > file_offset_of_buffer_end)
@@ -491,7 +460,10 @@ bool CachedReadBufferFromRemoteFS::completeFileSegmentAndGetNext()
 
     /// Do not hold pointer to file segment if it is not needed anymore
     /// so can become releasable and can be evicted from cache.
-    file_segments_holder->file_segments.erase(file_segment_it);
+    /// If the status of filesegment state is SKIP_CACHE, it will not be deleted.
+    /// It will be deleted from the cache when the holder is destructed.
+    if ((*file_segment_it)->state() != FileSegment::State::SKIP_CACHE)
+        file_segments_holder->file_segments.erase(file_segment_it);
 
     if (current_file_segment_it == file_segments_holder->file_segments.end())
         return false;
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index 57b72d0190d..c2a317b43b0 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -1,6 +1,5 @@
 #include "ReadBufferFromRemoteFSGather.h"
 
-#include <Disks/IDiskRemote.h>
 #include <IO/SeekableReadBuffer.h>
 #include <Disks/IO/ReadBufferFromWebServer.h>
 
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index d6f12b2f45e..eb6d26a4c15 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Common/config.h>
-#include <Disks/IDiskRemote.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadSettings.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
 
 #if USE_AZURE_BLOB_STORAGE
 #include <azure/storage/blobs.hpp>
@@ -114,7 +114,7 @@ class ReadBufferFromS3Gather final : public ReadBufferFromRemoteFSGather
 {
 public:
     ReadBufferFromS3Gather(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+        std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & version_id_,
         const std::string & common_path_prefix_,
@@ -132,7 +132,7 @@ public:
     SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
 
 private:
-    std::shared_ptr<Aws::S3::S3Client> client_ptr;
+    std::shared_ptr<const Aws::S3::S3Client> client_ptr;
     String bucket;
     String version_id;
     UInt64 max_single_read_retries;
@@ -146,7 +146,7 @@ class ReadBufferFromAzureBlobStorageGather final : public ReadBufferFromRemoteFS
 {
 public:
     ReadBufferFromAzureBlobStorageGather(
-        std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
+        std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
         const std::string & common_path_prefix_,
         const BlobsPathToSize & blobs_to_read_,
         size_t max_single_read_retries_,
@@ -162,7 +162,7 @@ public:
     SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
 
 private:
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
     size_t max_single_read_retries;
     size_t max_single_download_retries;
 };
diff --git a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
index a0669be411f..64495a538e4 100644
--- a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
@@ -2,7 +2,6 @@
 
 #include <Common/config.h>
 #include <IO/ReadBufferFromFile.h>
-#include <Disks/IDiskRemote.h>
 #include <utility>
 
 
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.h b/src/Disks/IO/ThreadPoolRemoteFSReader.h
index b2d5f11724a..0d5513e4c01 100644
--- a/src/Disks/IO/ThreadPoolRemoteFSReader.h
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.h
@@ -4,7 +4,6 @@
 #include <IO/SeekableReadBuffer.h>
 #include <Common/ThreadPool.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IDiskRemote.h>
 
 
 namespace DB
diff --git a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
index dca2fb17ba7..77da60ca07d 100644
--- a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
@@ -36,7 +36,8 @@ WriteIndirectBufferFromRemoteFS::~WriteIndirectBufferFromRemoteFS()
 void WriteIndirectBufferFromRemoteFS::finalizeImpl()
 {
     WriteBufferFromFileDecorator::finalizeImpl();
-    create_metadata_callback(count());
+    if (create_metadata_callback)
+        create_metadata_callback(count());
 }
 
 
diff --git a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
index 84bd2b99c7e..38a1872bb45 100644
--- a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
@@ -2,7 +2,6 @@
 
 #include <Common/config.h>
 
-#include <Disks/IDiskRemote.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromFileDecorator.h>
 
diff --git a/src/Disks/AzureBlobStorage/AzureBlobStorageAuth.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp
similarity index 80%
rename from src/Disks/AzureBlobStorage/AzureBlobStorageAuth.cpp
rename to src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp
index 94553ba04e9..3dcdd47826f 100644
--- a/src/Disks/AzureBlobStorage/AzureBlobStorageAuth.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp
@@ -1,4 +1,4 @@
-#include <Disks/AzureBlobStorage/AzureBlobStorageAuth.h>
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
 
 #if USE_AZURE_BLOB_STORAGE
 
@@ -66,27 +66,27 @@ AzureBlobStorageEndpoint processAzureBlobStorageEndpoint(const Poco::Util::Abstr
 
 
 template <class T>
-std::shared_ptr<T> getClientWithConnectionString(const String & connection_str, const String & container_name) = delete;
+std::unique_ptr<T> getClientWithConnectionString(const String & connection_str, const String & container_name) = delete;
 
 
 template<>
-std::shared_ptr<BlobServiceClient> getClientWithConnectionString(
+std::unique_ptr<BlobServiceClient> getClientWithConnectionString(
     const String & connection_str, const String & /*container_name*/)
 {
-    return std::make_shared<BlobServiceClient>(BlobServiceClient::CreateFromConnectionString(connection_str));
+    return std::make_unique<BlobServiceClient>(BlobServiceClient::CreateFromConnectionString(connection_str));
 }
 
 
 template<>
-std::shared_ptr<BlobContainerClient> getClientWithConnectionString(
+std::unique_ptr<BlobContainerClient> getClientWithConnectionString(
     const String & connection_str, const String & container_name)
 {
-    return std::make_shared<BlobContainerClient>(BlobContainerClient::CreateFromConnectionString(connection_str, container_name));
+    return std::make_unique<BlobContainerClient>(BlobContainerClient::CreateFromConnectionString(connection_str, container_name));
 }
 
 
 template <class T>
-std::shared_ptr<T> getAzureBlobStorageClientWithAuth(
+std::unique_ptr<T> getAzureBlobStorageClientWithAuth(
     const String & url, const String & container_name, const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
 {
     if (config.has(config_prefix + ".connection_string"))
@@ -101,15 +101,15 @@ std::shared_ptr<T> getAzureBlobStorageClientWithAuth(
             config.getString(config_prefix + ".account_name"),
             config.getString(config_prefix + ".account_key")
         );
-        return std::make_shared<T>(url, storage_shared_key_credential);
+        return std::make_unique<T>(url, storage_shared_key_credential);
     }
 
     auto managed_identity_credential = std::make_shared<Azure::Identity::ManagedIdentityCredential>();
-    return std::make_shared<T>(url, managed_identity_credential);
+    return std::make_unique<T>(url, managed_identity_credential);
 }
 
 
-std::shared_ptr<BlobContainerClient> getAzureBlobContainerClient(
+std::unique_ptr<BlobContainerClient> getAzureBlobContainerClient(
     const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
 {
     auto endpoint = processAzureBlobStorageEndpoint(config, config_prefix);
@@ -136,10 +136,20 @@ std::shared_ptr<BlobContainerClient> getAzureBlobContainerClient(
         }
     }
 
-    return std::make_shared<BlobContainerClient>(
+    return std::make_unique<BlobContainerClient>(
         blob_service_client->CreateBlobContainer(container_name).Value);
 }
 
+std::unique_ptr<AzureObjectStorageSettings> getAzureBlobStorageSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr /*context*/)
+{
+    return std::make_unique<AzureObjectStorageSettings>(
+        config.getUInt64(config_prefix + ".max_single_part_upload_size", 100 * 1024 * 1024),
+        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
+        config.getInt(config_prefix + ".max_single_read_retries", 3),
+        config.getInt(config_prefix + ".max_single_download_retries", 3)
+    );
+}
+
 }
 
 #endif
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h
new file mode 100644
index 00000000000..6ebe169af50
--- /dev/null
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Common/config.h>
+
+#if USE_AZURE_BLOB_STORAGE
+
+#include <azure/storage/blobs.hpp>
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
+
+namespace DB
+{
+
+std::unique_ptr<Azure::Storage::Blobs::BlobContainerClient> getAzureBlobContainerClient(
+    const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
+
+std::unique_ptr<AzureObjectStorageSettings> getAzureBlobStorageSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr /*context*/);
+
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
new file mode 100644
index 00000000000..4ea7c609a51
--- /dev/null
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -0,0 +1,218 @@
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
+
+#if USE_AZURE_BLOB_STORAGE
+
+#include <IO/ReadBufferFromAzureBlobStorage.h>
+#include <IO/WriteBufferFromAzureBlobStorage.h>
+#include <IO/SeekAvoidingReadBuffer.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
+
+namespace DB
+{
+
+
+namespace ErrorCodes
+{
+    extern const int AZURE_BLOB_STORAGE_ERROR;
+    extern const int UNSUPPORTED_METHOD;
+}
+
+
+AzureObjectStorage::AzureObjectStorage(
+    FileCachePtr && cache_,
+    const String & name_,
+    AzureClientPtr && client_,
+    SettingsPtr && settings_)
+    : IObjectStorage(std::move(cache_))
+    , name(name_)
+    , client(std::move(client_))
+    , settings(std::move(settings_))
+{
+}
+
+bool AzureObjectStorage::exists(const std::string & uri) const
+{
+    auto client_ptr = client.get();
+
+    /// What a shame, no Exists method...
+    Azure::Storage::Blobs::ListBlobsOptions options;
+    options.Prefix = uri;
+    options.PageSizeHint = 1;
+
+    auto blobs_list_response = client_ptr->ListBlobs(options);
+    auto blobs_list = blobs_list_response.Blobs;
+
+    for (const auto & blob : blobs_list)
+    {
+        if (uri == blob.Name)
+            return true;
+    }
+
+    return false;
+}
+
+std::unique_ptr<SeekableReadBuffer> AzureObjectStorage::readObject( /// NOLINT
+    const std::string & path,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+    auto settings_ptr = settings.get();
+
+    return std::make_unique<ReadBufferFromAzureBlobStorage>(
+        client.get(), path, settings_ptr->max_single_read_retries,
+        settings_ptr->max_single_download_retries, read_settings.remote_fs_buffer_size);
+}
+
+std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObjects( /// NOLINT
+    const std::string & common_path_prefix,
+    const BlobsPathToSize & blobs_to_read,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+    auto settings_ptr = settings.get();
+    auto reader_impl = std::make_unique<ReadBufferFromAzureBlobStorageGather>(
+        client.get(), common_path_prefix, blobs_to_read,
+        settings_ptr->max_single_read_retries, settings_ptr->max_single_download_retries, read_settings);
+
+    if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
+    {
+        auto reader = getThreadPoolReader();
+        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(reader_impl));
+    }
+    else
+    {
+        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(reader_impl));
+        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings_ptr->min_bytes_for_seek);
+    }
+}
+
+/// Open the file for write and return WriteBufferFromFileBase object.
+std::unique_ptr<WriteBufferFromFileBase> AzureObjectStorage::writeObject( /// NOLINT
+    const std::string & path,
+    WriteMode mode,
+    std::optional<ObjectAttributes>,
+    FinalizeCallback && finalize_callback,
+    size_t buf_size,
+    const WriteSettings &)
+{
+    if (mode != WriteMode::Rewrite)
+        throw Exception("Azure storage doesn't support append", ErrorCodes::UNSUPPORTED_METHOD);
+
+    auto buffer = std::make_unique<WriteBufferFromAzureBlobStorage>(
+        client.get(),
+        path,
+        settings.get()->max_single_part_upload_size,
+        buf_size);
+
+    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(buffer), std::move(finalize_callback), path);
+}
+
+void AzureObjectStorage::listPrefix(const std::string & path, BlobsPathToSize & children) const
+{
+    auto client_ptr = client.get();
+
+    Azure::Storage::Blobs::ListBlobsOptions blobs_list_options;
+    blobs_list_options.Prefix = path;
+
+    auto blobs_list_response = client_ptr->ListBlobs(blobs_list_options);
+    auto blobs_list = blobs_list_response.Blobs;
+
+    for (const auto & blob : blobs_list)
+        children.emplace_back(blob.Name, blob.BlobSize);
+}
+
+/// Remove file. Throws exception if file doesn't exists or it's a directory.
+void AzureObjectStorage::removeObject(const std::string & path)
+{
+    auto client_ptr = client.get();
+    auto delete_info = client_ptr->DeleteBlob(path);
+    if (!delete_info.Value.Deleted)
+        throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Failed to delete file in AzureBlob Storage: {}", path);
+}
+
+void AzureObjectStorage::removeObjects(const std::vector<std::string> & paths)
+{
+    auto client_ptr = client.get();
+    for (const auto & path : paths)
+    {
+        auto delete_info = client_ptr->DeleteBlob(path);
+        if (!delete_info.Value.Deleted)
+            throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Failed to delete file in AzureBlob Storage: {}", path);
+    }
+}
+
+void AzureObjectStorage::removeObjectIfExists(const std::string & path)
+{
+    auto client_ptr = client.get();
+    auto delete_info = client_ptr->DeleteBlob(path);
+}
+
+void AzureObjectStorage::removeObjectsIfExist(const std::vector<std::string> & paths)
+{
+    auto client_ptr = client.get();
+    for (const auto & path : paths)
+        auto delete_info = client_ptr->DeleteBlob(path);
+}
+
+
+ObjectMetadata AzureObjectStorage::getObjectMetadata(const std::string & path) const
+{
+    auto client_ptr = client.get();
+    auto blob_client = client_ptr->GetBlobClient(path);
+    auto properties = blob_client.GetProperties().Value;
+    ObjectMetadata result;
+    result.size_bytes = properties.BlobSize;
+    if (!properties.Metadata.empty())
+    {
+        result.attributes.emplace();
+        for (const auto & [key, value] : properties.Metadata)
+            (*result.attributes)[key] = value;
+    }
+    result.last_modified.emplace(properties.LastModified.time_since_epoch().count());
+    return result;
+}
+
+void AzureObjectStorage::copyObject( /// NOLINT
+    const std::string & object_from,
+    const std::string & object_to,
+    std::optional<ObjectAttributes> object_to_attributes)
+{
+    auto client_ptr = client.get();
+    auto dest_blob_client = client_ptr->GetBlobClient(object_to);
+    auto source_blob_client = client_ptr->GetBlobClient(object_from);
+    Azure::Storage::Blobs::CopyBlobFromUriOptions copy_options;
+    if (object_to_attributes.has_value())
+    {
+        for (const auto & [key, value] : *object_to_attributes)
+            copy_options.Metadata[key] = value;
+    }
+
+    dest_blob_client.CopyFromUri(source_blob_client.GetUrl(), copy_options);
+}
+
+void AzureObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    auto new_settings = getAzureBlobStorageSettings(config, config_prefix, context);
+    settings.set(std::move(new_settings));
+
+    /// We don't update client
+}
+
+
+std::unique_ptr<IObjectStorage> AzureObjectStorage::cloneObjectStorage(const std::string &, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    return std::make_unique<AzureObjectStorage>(
+        nullptr,
+        name,
+        getAzureBlobContainerClient(config, config_prefix),
+        getAzureBlobStorageSettings(config, config_prefix, context)
+    );
+}
+
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
new file mode 100644
index 00000000000..37c3ba72ed9
--- /dev/null
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -0,0 +1,113 @@
+#pragma once
+#include <Common/config.h>
+
+#if USE_AZURE_BLOB_STORAGE
+
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Common/getRandomASCIIString.h>
+
+
+namespace DB
+{
+
+struct AzureObjectStorageSettings
+{
+    AzureObjectStorageSettings(
+        uint64_t max_single_part_upload_size_,
+        uint64_t min_bytes_for_seek_,
+        int max_single_read_retries_,
+        int max_single_download_retries_)
+        : max_single_part_upload_size(max_single_part_upload_size_)
+        , min_bytes_for_seek(min_bytes_for_seek_)
+        , max_single_read_retries(max_single_read_retries_)
+        , max_single_download_retries(max_single_download_retries_)
+    {
+    }
+
+    size_t max_single_part_upload_size; /// NOTE: on 32-bit machines it will be at most 4GB, but size_t is also used in BufferBase for offset
+    uint64_t min_bytes_for_seek;
+    size_t max_single_read_retries;
+    size_t max_single_download_retries;
+};
+
+using AzureClient = Azure::Storage::Blobs::BlobContainerClient;
+using AzureClientPtr = std::unique_ptr<Azure::Storage::Blobs::BlobContainerClient>;
+
+class AzureObjectStorage : public IObjectStorage
+{
+public:
+
+    using SettingsPtr = std::unique_ptr<AzureObjectStorageSettings>;
+
+    AzureObjectStorage(
+        FileCachePtr && cache_,
+        const String & name_,
+        AzureClientPtr && client_,
+        SettingsPtr && settings_);
+
+    bool exists(const std::string & uri) const override;
+
+    std::unique_ptr<SeekableReadBuffer> readObject( /// NOLINT
+        const std::string & path,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObjects( /// NOLINT
+        const std::string & common_path_prefix,
+        const BlobsPathToSize & blobs_to_read,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    std::unique_ptr<WriteBufferFromFileBase> writeObject( /// NOLINT
+        const std::string & path,
+        WriteMode mode,
+        std::optional<ObjectAttributes> attributes = {},
+        FinalizeCallback && finalize_callback = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        const WriteSettings & write_settings = {}) override;
+
+    void listPrefix(const std::string & path, BlobsPathToSize & children) const override;
+    /// Remove file. Throws exception if file doesn't exists or it's a directory.
+    void removeObject(const std::string & path) override;
+
+    void removeObjects(const std::vector<std::string> & paths) override;
+
+    void removeObjectIfExists(const std::string & path) override;
+
+    void removeObjectsIfExist(const std::vector<std::string> & paths) override;
+
+    ObjectMetadata getObjectMetadata(const std::string & path) const override;
+
+    void copyObject( /// NOLINT
+        const std::string & object_from,
+        const std::string & object_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    void shutdown() override {}
+
+    void startup() override {}
+
+    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) override;
+
+    String getObjectsNamespace() const override { return ""; }
+
+    std::unique_ptr<IObjectStorage> cloneObjectStorage(const std::string & new_namespace, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) override;
+
+private:
+    const String name;
+    /// client used to access the files in the Blob Storage cloud
+    MultiVersion<Azure::Storage::Blobs::BlobContainerClient> client;
+    MultiVersion<AzureObjectStorageSettings> settings;
+};
+
+}
+
+#endif
diff --git a/src/Disks/AzureBlobStorage/registerDiskAzureBlobStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
similarity index 68%
rename from src/Disks/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
rename to src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
index 128c7534b3c..92ba6e426b3 100644
--- a/src/Disks/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
@@ -6,10 +6,11 @@
 
 #include <Disks/DiskRestartProxy.h>
 #include <Disks/DiskCacheWrapper.h>
-#include <Disks/RemoteDisksCommon.h>
-#include <Disks/AzureBlobStorage/DiskAzureBlobStorage.h>
-#include <Disks/AzureBlobStorage/AzureBlobStorageAuth.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
 
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
 
 namespace DB
 {
@@ -19,18 +20,19 @@ namespace ErrorCodes
     extern const int PATH_ACCESS_DENIED;
 }
 
+namespace
+{
+
 constexpr char test_file[] = "test.txt";
 constexpr char test_str[] = "test";
 constexpr size_t test_str_size = 4;
 
-
 void checkWriteAccess(IDisk & disk)
 {
     auto file = disk.writeFile(test_file, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
     file->write(test_str, test_str_size);
 }
 
-
 void checkReadAccess(IDisk & disk)
 {
     auto file = disk.readFile(test_file);
@@ -40,7 +42,6 @@ void checkReadAccess(IDisk & disk)
         throw Exception("No read access to disk", ErrorCodes::PATH_ACCESS_DENIED);
 }
 
-
 void checkReadWithOffset(IDisk & disk)
 {
     auto file = disk.readFile(test_file);
@@ -53,25 +54,13 @@ void checkReadWithOffset(IDisk & disk)
         throw Exception("Failed to read file with offset", ErrorCodes::PATH_ACCESS_DENIED);
 }
 
-
 void checkRemoveAccess(IDisk & disk)
 {
     disk.removeFile(test_file);
 }
 
-
-std::unique_ptr<DiskAzureBlobStorageSettings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr /*context*/)
-{
-    return std::make_unique<DiskAzureBlobStorageSettings>(
-        config.getUInt64(config_prefix + ".max_single_part_upload_size", 100 * 1024 * 1024),
-        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-        config.getInt(config_prefix + ".max_single_read_retries", 3),
-        config.getInt(config_prefix + ".max_single_download_retries", 3),
-        config.getInt(config_prefix + ".thread_pool_size", 16)
-    );
 }
 
-
 void registerDiskAzureBlobStorage(DiskFactory & factory)
 {
     auto creator = [](
@@ -83,12 +72,25 @@ void registerDiskAzureBlobStorage(DiskFactory & factory)
     {
         auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
 
-        std::shared_ptr<IDisk> azure_blob_storage_disk = std::make_shared<DiskAzureBlobStorage>(
+        /// FIXME Cache currently unsupported :(
+        ObjectStoragePtr azure_object_storage = std::make_unique<AzureObjectStorage>(
+            nullptr,
             name,
-            metadata_disk,
             getAzureBlobContainerClient(config, config_prefix),
-            getSettings(config, config_prefix, context),
-            getSettings
+            getAzureBlobStorageSettings(config, config_prefix, context));
+
+        uint64_t copy_thread_pool_size = config.getUInt(config_prefix + ".thread_pool_size", 16);
+        bool send_metadata = config.getBool(config_prefix + ".send_metadata", false);
+
+        std::shared_ptr<IDisk> azure_blob_storage_disk = std::make_shared<DiskObjectStorage>(
+            name,
+            /* no namespaces */"",
+            "DiskAzureBlobStorage",
+            metadata_disk,
+            std::move(azure_object_storage),
+            DiskType::AzureBlobStorage,
+            send_metadata,
+            copy_thread_pool_size
         );
 
         if (!config.getBool(config_prefix + ".skip_access_check", false))
@@ -99,9 +101,17 @@ void registerDiskAzureBlobStorage(DiskFactory & factory)
             checkRemoveAccess(*azure_blob_storage_disk);
         }
 
-        azure_blob_storage_disk->startup();
+#ifdef NDEBUG
+        bool use_cache = true;
+#else
+        /// Current cache implementation lead to allocations in destructor of
+        /// read buffer.
+        bool use_cache = false;
+#endif
 
-        if (config.getBool(config_prefix + ".cache_enabled", true))
+        azure_blob_storage_disk->startup(context);
+
+        if (config.getBool(config_prefix + ".cache_enabled", use_cache))
         {
             String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
             azure_blob_storage_disk = wrapWithCache(azure_blob_storage_disk, "azure-blob-storage-cache", cache_path, metadata_path);
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
new file mode 100644
index 00000000000..208e05fa1bc
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -0,0 +1,699 @@
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <Common/createHardLink.h>
+#include <Common/quoteString.h>
+#include <Common/logger_useful.h>
+#include <Common/checkStackSize.h>
+#include <Common/getRandomASCIIString.h>
+#include <boost/algorithm/string.hpp>
+#include <Common/filesystemHelpers.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <Common/FileCache.h>
+#include <Disks/ObjectStorages/DiskObjectStorageMetadataHelper.h>
+#include <Poco/Util/AbstractConfiguration.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DISK_INDEX;
+    extern const int UNKNOWN_FORMAT;
+    extern const int FILE_ALREADY_EXISTS;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int BAD_FILE_TYPE;
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int CANNOT_READ_ALL_DATA;
+}
+
+static String revisionToString(UInt64 revision)
+{
+    return std::bitset<64>(revision).to_string();
+}
+
+namespace
+{
+
+/// Runs tasks asynchronously using thread pool.
+class AsyncThreadPoolExecutor : public Executor
+{
+public:
+    AsyncThreadPoolExecutor(const String & name_, int thread_pool_size)
+        : name(name_)
+        , pool(ThreadPool(thread_pool_size)) {}
+
+    std::future<void> execute(std::function<void()> task) override
+    {
+        auto promise = std::make_shared<std::promise<void>>();
+        pool.scheduleOrThrowOnError(
+            [promise, task]()
+            {
+                try
+                {
+                    task();
+                    promise->set_value();
+                }
+                catch (...)
+                {
+                    tryLogCurrentException("Failed to run async task");
+
+                    try
+                    {
+                        promise->set_exception(std::current_exception());
+                    }
+                    catch (...) {}
+                }
+            });
+
+        return promise->get_future();
+    }
+
+    void setMaxThreads(size_t threads)
+    {
+        pool.setMaxThreads(threads);
+    }
+
+private:
+    String name;
+    ThreadPool pool;
+};
+
+}
+
+DiskObjectStorage::DiskObjectStorage(
+    const String & name_,
+    const String & remote_fs_root_path_,
+    const String & log_name,
+    DiskPtr metadata_disk_,
+    ObjectStoragePtr && object_storage_,
+    DiskType disk_type_,
+    bool send_metadata_,
+    uint64_t thread_pool_size)
+    : IDisk(std::make_unique<AsyncThreadPoolExecutor>(log_name, thread_pool_size))
+    , name(name_)
+    , remote_fs_root_path(remote_fs_root_path_)
+    , log (&Poco::Logger::get(log_name))
+    , metadata_disk(metadata_disk_)
+    , disk_type(disk_type_)
+    , object_storage(std::move(object_storage_))
+    , send_metadata(send_metadata_)
+    , metadata_helper(std::make_unique<DiskObjectStorageMetadataHelper>(this, ReadSettings{}))
+{}
+
+DiskObjectStorage::Metadata DiskObjectStorage::readMetadataUnlocked(const String & path, std::shared_lock<std::shared_mutex> &) const
+{
+    return Metadata::readMetadata(remote_fs_root_path, metadata_disk, path);
+}
+
+
+DiskObjectStorage::Metadata DiskObjectStorage::readMetadata(const String & path) const
+{
+    std::shared_lock lock(metadata_mutex);
+    return readMetadataUnlocked(path, lock);
+}
+
+DiskObjectStorage::Metadata DiskObjectStorage::readUpdateAndStoreMetadata(const String & path, bool sync, DiskObjectStorage::MetadataUpdater updater)
+{
+    std::unique_lock lock(metadata_mutex);
+    return Metadata::readUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
+}
+
+
+void DiskObjectStorage::readUpdateStoreMetadataAndRemove(const String & path, bool sync, DiskObjectStorage::MetadataUpdater updater)
+{
+    std::unique_lock lock(metadata_mutex);
+    Metadata::readUpdateStoreMetadataAndRemove(remote_fs_root_path, metadata_disk, path, sync, updater);
+}
+
+DiskObjectStorage::Metadata DiskObjectStorage::readOrCreateUpdateAndStoreMetadata(const String & path, WriteMode mode, bool sync, DiskObjectStorage::MetadataUpdater updater)
+{
+    if (mode == WriteMode::Rewrite || !metadata_disk->exists(path))
+    {
+        std::unique_lock lock(metadata_mutex);
+        return Metadata::createUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
+    }
+    else
+    {
+        return Metadata::readUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
+    }
+}
+
+DiskObjectStorage::Metadata DiskObjectStorage::createAndStoreMetadata(const String & path, bool sync)
+{
+    return Metadata::createAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync);
+}
+
+DiskObjectStorage::Metadata DiskObjectStorage::createUpdateAndStoreMetadata(const String & path, bool sync, DiskObjectStorage::MetadataUpdater updater)
+{
+    return Metadata::createUpdateAndStoreMetadata(remote_fs_root_path, metadata_disk, path, sync, updater);
+}
+
+std::vector<String> DiskObjectStorage::getRemotePaths(const String & local_path) const
+{
+    auto metadata = readMetadata(local_path);
+
+    std::vector<String> remote_paths;
+    for (const auto & [remote_path, _] : metadata.remote_fs_objects)
+        remote_paths.push_back(fs::path(metadata.remote_fs_root_path) / remote_path);
+
+    return remote_paths;
+
+}
+
+void DiskObjectStorage::getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithRemotePaths> & paths_map)
+{
+    /// Protect against concurrent delition of files (for example because of a merge).
+    if (metadata_disk->isFile(local_path))
+    {
+        try
+        {
+            paths_map.emplace_back(local_path, getRemotePaths(local_path));
+        }
+        catch (const Exception & e)
+        {
+            /// Unfortunately in rare cases it can happen when files disappear
+            /// or can be empty in case of operation interruption (like cancelled metadata fetch)
+            if (e.code() == ErrorCodes::FILE_DOESNT_EXIST ||
+                e.code() == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF ||
+                e.code() == ErrorCodes::CANNOT_READ_ALL_DATA)
+                return;
+
+            throw;
+        }
+    }
+    else
+    {
+        DiskDirectoryIteratorPtr it;
+        try
+        {
+            it = iterateDirectory(local_path);
+        }
+        catch (const Exception & e)
+        {
+            /// Unfortunately in rare cases it can happen when files disappear
+            /// or can be empty in case of operation interruption (like cancelled metadata fetch)
+            if (e.code() == ErrorCodes::FILE_DOESNT_EXIST ||
+                e.code() == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF ||
+                e.code() == ErrorCodes::CANNOT_READ_ALL_DATA)
+                return;
+        }
+        catch (const fs::filesystem_error & e)
+        {
+            if (e.code() == std::errc::no_such_file_or_directory)
+                return;
+            throw;
+        }
+
+        for (; it->isValid(); it->next())
+            DiskObjectStorage::getRemotePathsRecursive(fs::path(local_path) / it->name(), paths_map);
+    }
+}
+
+bool DiskObjectStorage::exists(const String & path) const
+{
+    return metadata_disk->exists(path);
+}
+
+
+bool DiskObjectStorage::isFile(const String & path) const
+{
+    return metadata_disk->isFile(path);
+}
+
+
+void DiskObjectStorage::createFile(const String & path)
+{
+    createAndStoreMetadata(path, false);
+}
+
+size_t DiskObjectStorage::getFileSize(const String & path) const
+{
+    return readMetadata(path).total_size;
+}
+
+void DiskObjectStorage::moveFile(const String & from_path, const String & to_path, bool should_send_metadata)
+{
+    if (exists(to_path))
+        throw Exception("File already exists: " + to_path, ErrorCodes::FILE_ALREADY_EXISTS);
+
+    if (should_send_metadata)
+    {
+        auto revision = metadata_helper->revision_counter + 1;
+        metadata_helper->revision_counter += 1;
+
+        const ObjectAttributes object_metadata {
+            {"from_path", from_path},
+            {"to_path", to_path}
+        };
+        metadata_helper->createFileOperationObject("rename", revision, object_metadata);
+    }
+
+    {
+        std::unique_lock lock(metadata_mutex);
+        metadata_disk->moveFile(from_path, to_path);
+    }
+}
+
+void DiskObjectStorage::moveFile(const String & from_path, const String & to_path)
+{
+    moveFile(from_path, to_path, send_metadata);
+}
+
+void DiskObjectStorage::replaceFile(const String & from_path, const String & to_path)
+{
+    if (exists(to_path))
+    {
+        const String tmp_path = to_path + ".old";
+        moveFile(to_path, tmp_path);
+        moveFile(from_path, to_path);
+        removeFile(tmp_path);
+    }
+    else
+        moveFile(from_path, to_path);
+}
+
+void DiskObjectStorage::removeSharedFile(const String & path, bool delete_metadata_only)
+{
+    std::vector<String> paths_to_remove;
+    removeMetadata(path, paths_to_remove);
+
+    if (!delete_metadata_only)
+        removeFromRemoteFS(paths_to_remove);
+}
+
+void DiskObjectStorage::removeFromRemoteFS(const std::vector<String> & paths)
+{
+    object_storage->removeObjects(paths);
+}
+
+UInt32 DiskObjectStorage::getRefCount(const String & path) const
+{
+    return readMetadata(path).ref_count;
+}
+
+std::unordered_map<String, String> DiskObjectStorage::getSerializedMetadata(const std::vector<String> & file_paths) const
+{
+    std::unordered_map<String, String> metadatas;
+
+    std::shared_lock lock(metadata_mutex);
+
+    for (const auto & path : file_paths)
+    {
+        DiskObjectStorage::Metadata metadata = readMetadataUnlocked(path, lock);
+        metadata.ref_count = 0;
+        metadatas[path] = metadata.serializeToString();
+    }
+
+    return metadatas;
+}
+
+String DiskObjectStorage::getUniqueId(const String & path) const
+{
+    LOG_TRACE(log, "Remote path: {}, Path: {}", remote_fs_root_path, path);
+    auto metadata = readMetadata(path);
+    String id;
+    if (!metadata.remote_fs_objects.empty())
+        id = metadata.remote_fs_root_path + metadata.remote_fs_objects[0].relative_path;
+    return id;
+}
+
+bool DiskObjectStorage::checkObjectExists(const String & path) const
+{
+    if (!path.starts_with(remote_fs_root_path))
+        return false;
+
+    return object_storage->exists(path);
+}
+
+bool DiskObjectStorage::checkUniqueId(const String & id) const
+{
+    return checkObjectExists(id);
+}
+
+void DiskObjectStorage::createHardLink(const String & src_path, const String & dst_path, bool should_send_metadata)
+{
+    readUpdateAndStoreMetadata(src_path, false, [](Metadata & metadata) { metadata.ref_count++; return true; });
+
+    if (should_send_metadata && !dst_path.starts_with("shadow/"))
+    {
+        auto revision = metadata_helper->revision_counter + 1;
+        metadata_helper->revision_counter += 1;
+        const ObjectAttributes object_metadata {
+            {"src_path", src_path},
+            {"dst_path", dst_path}
+        };
+        metadata_helper->createFileOperationObject("hardlink", revision, object_metadata);
+    }
+
+    /// Create FS hardlink to metadata file.
+    metadata_disk->createHardLink(src_path, dst_path);
+}
+
+void DiskObjectStorage::createHardLink(const String & src_path, const String & dst_path)
+{
+    createHardLink(src_path, dst_path, send_metadata);
+}
+
+
+void DiskObjectStorage::setReadOnly(const String & path)
+{
+    /// We should store read only flag inside metadata file (instead of using FS flag),
+    /// because we modify metadata file when create hard-links from it.
+    readUpdateAndStoreMetadata(path, false, [](Metadata & metadata) { metadata.read_only = true; return true; });
+}
+
+
+bool DiskObjectStorage::isDirectory(const String & path) const
+{
+    return metadata_disk->isDirectory(path);
+}
+
+
+void DiskObjectStorage::createDirectory(const String & path)
+{
+    metadata_disk->createDirectory(path);
+}
+
+
+void DiskObjectStorage::createDirectories(const String & path)
+{
+    metadata_disk->createDirectories(path);
+}
+
+
+void DiskObjectStorage::clearDirectory(const String & path)
+{
+    for (auto it = iterateDirectory(path); it->isValid(); it->next())
+        if (isFile(it->path()))
+            removeFile(it->path());
+}
+
+
+void DiskObjectStorage::removeDirectory(const String & path)
+{
+    metadata_disk->removeDirectory(path);
+}
+
+
+DiskDirectoryIteratorPtr DiskObjectStorage::iterateDirectory(const String & path)
+{
+    return metadata_disk->iterateDirectory(path);
+}
+
+
+void DiskObjectStorage::listFiles(const String & path, std::vector<String> & file_names)
+{
+    for (auto it = iterateDirectory(path); it->isValid(); it->next())
+        file_names.push_back(it->name());
+}
+
+
+void DiskObjectStorage::setLastModified(const String & path, const Poco::Timestamp & timestamp)
+{
+    metadata_disk->setLastModified(path, timestamp);
+}
+
+
+Poco::Timestamp DiskObjectStorage::getLastModified(const String & path)
+{
+    return metadata_disk->getLastModified(path);
+}
+
+void DiskObjectStorage::removeMetadata(const String & path, std::vector<String> & paths_to_remove)
+{
+    LOG_TRACE(log, "Remove file by path: {}", backQuote(metadata_disk->getPath() + path));
+
+    if (!metadata_disk->exists(path))
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Metadata path '{}' doesn't exist", path);
+
+    if (!metadata_disk->isFile(path))
+        throw Exception(ErrorCodes::BAD_FILE_TYPE, "Path '{}' is not a regular file", path);
+
+    try
+    {
+        auto metadata_updater = [&paths_to_remove, this] (Metadata & metadata)
+        {
+            if (metadata.ref_count == 0)
+            {
+                for (const auto & [remote_fs_object_path, _] : metadata.remote_fs_objects)
+                {
+                    String object_path = fs::path(remote_fs_root_path) / remote_fs_object_path;
+                    paths_to_remove.push_back(object_path);
+                    object_storage->removeFromCache(object_path);
+                }
+
+                return false;
+            }
+            else /// In other case decrement number of references, save metadata and delete hardlink.
+            {
+                --metadata.ref_count;
+            }
+
+            return true;
+        };
+
+        readUpdateStoreMetadataAndRemove(path, false, metadata_updater);
+        /// If there is no references - delete content from remote FS.
+    }
+    catch (const Exception & e)
+    {
+        /// If it's impossible to read meta - just remove it from FS.
+        if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
+        {
+            LOG_WARNING(log,
+                "Metadata file {} can't be read by reason: {}. Removing it forcibly.",
+                backQuote(path), e.nested() ? e.nested()->message() : e.message());
+
+            std::unique_lock lock(metadata_mutex);
+            metadata_disk->removeFile(path);
+        }
+        else
+            throw;
+    }
+}
+
+
+void DiskObjectStorage::removeMetadataRecursive(const String & path, std::unordered_map<String, std::vector<String>> & paths_to_remove)
+{
+    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
+
+    if (metadata_disk->isFile(path))
+    {
+        removeMetadata(path, paths_to_remove[path]);
+    }
+    else
+    {
+        for (auto it = iterateDirectory(path); it->isValid(); it->next())
+            removeMetadataRecursive(it->path(), paths_to_remove);
+
+        metadata_disk->removeDirectory(path);
+    }
+}
+
+
+void DiskObjectStorage::shutdown()
+{
+    LOG_INFO(log, "Shutting down disk {}", name);
+    object_storage->shutdown();
+    LOG_INFO(log, "Disk {} shut down", name);
+}
+
+void DiskObjectStorage::startup(ContextPtr context)
+{
+
+    LOG_INFO(log, "Starting up disk {}", name);
+    object_storage->startup();
+
+    restoreMetadataIfNeeded(context->getConfigRef(), "storage_configuration.disks." + name, context);
+
+    LOG_INFO(log, "Disk {} started up", name);
+}
+
+ReservationPtr DiskObjectStorage::reserve(UInt64 bytes)
+{
+    if (!tryReserve(bytes))
+        return {};
+
+    return std::make_unique<DiskObjectStorageReservation>(std::static_pointer_cast<DiskObjectStorage>(shared_from_this()), bytes);
+}
+
+void DiskObjectStorage::removeSharedFileIfExists(const String & path, bool delete_metadata_only)
+{
+    std::vector<String> paths_to_remove;
+    if (metadata_disk->exists(path))
+    {
+        removeMetadata(path, paths_to_remove);
+        if (!delete_metadata_only)
+            removeFromRemoteFS(paths_to_remove);
+    }
+}
+
+void DiskObjectStorage::removeSharedRecursive(const String & path, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only)
+{
+    std::unordered_map<String, std::vector<String>> paths_to_remove;
+    removeMetadataRecursive(path, paths_to_remove);
+
+    if (!keep_all_batch_data)
+    {
+        std::vector<String> remove_from_remote;
+        for (auto && [local_path, remote_paths] : paths_to_remove)
+        {
+            if (!file_names_remove_metadata_only.contains(fs::path(local_path).filename()))
+            {
+                remove_from_remote.insert(remove_from_remote.end(), remote_paths.begin(), remote_paths.end());
+            }
+        }
+        removeFromRemoteFS(remove_from_remote);
+    }
+}
+
+std::optional<UInt64>  DiskObjectStorage::tryReserve(UInt64 bytes)
+{
+    std::lock_guard lock(reservation_mutex);
+
+    auto available_space = getAvailableSpace();
+    UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
+
+    if (bytes == 0)
+    {
+        LOG_TRACE(log, "Reserving 0 bytes on remote_fs disk {}", backQuote(name));
+        ++reservation_count;
+        return {unreserved_space};
+    }
+
+    if (unreserved_space >= bytes)
+    {
+        LOG_TRACE(log, "Reserving {} on disk {}, having unreserved {}.",
+            ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
+        ++reservation_count;
+        reserved_bytes += bytes;
+        return {unreserved_space - bytes};
+    }
+
+    return {};
+}
+
+std::unique_ptr<ReadBufferFromFileBase> DiskObjectStorage::readFile(
+    const String & path,
+    const ReadSettings & settings,
+    std::optional<size_t> read_hint,
+    std::optional<size_t> file_size) const
+{
+    auto metadata = readMetadata(path);
+    return object_storage->readObjects(remote_fs_root_path, metadata.remote_fs_objects, settings, read_hint, file_size);
+}
+
+std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorage::writeFile(
+    const String & path,
+    size_t buf_size,
+    WriteMode mode,
+    const WriteSettings & settings)
+{
+    auto blob_name = getRandomASCIIString();
+
+    std::optional<ObjectAttributes> object_attributes;
+    if (send_metadata)
+    {
+        auto revision = metadata_helper->revision_counter + 1;
+        metadata_helper->revision_counter++;
+        object_attributes = {
+            {"path", path}
+        };
+        blob_name = "r" + revisionToString(revision) + "-file-" + blob_name;
+    }
+
+    auto create_metadata_callback = [this, path, blob_name, mode] (size_t count)
+    {
+        readOrCreateUpdateAndStoreMetadata(path, mode, false,
+            [blob_name, count] (DiskObjectStorage::Metadata & metadata) { metadata.addObject(blob_name, count); return true; });
+    };
+
+    /// We always use mode Rewrite because we simulate append using metadata and different files
+    return object_storage->writeObject(
+        fs::path(remote_fs_root_path) / blob_name, WriteMode::Rewrite, object_attributes,
+        std::move(create_metadata_callback),
+        buf_size, settings);
+}
+
+
+void DiskObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context_, const String &, const DisksMap &)
+{
+    const auto config_prefix = "storage_configuration.disks." + name;
+    object_storage->applyNewSettings(config, config_prefix, context_);
+
+    if (AsyncThreadPoolExecutor * exec = dynamic_cast<AsyncThreadPoolExecutor *>(&getExecutor()))
+        exec->setMaxThreads(config.getInt(config_prefix + ".thread_pool_size", 16));
+}
+
+void DiskObjectStorage::restoreMetadataIfNeeded(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    if (send_metadata)
+    {
+        metadata_helper->restore(config, config_prefix, context);
+
+        if (metadata_helper->readSchemaVersion(object_storage.get(), remote_fs_root_path) < DiskObjectStorageMetadataHelper::RESTORABLE_SCHEMA_VERSION)
+            metadata_helper->migrateToRestorableSchema();
+
+        metadata_helper->findLastRevision();
+    }
+}
+
+void DiskObjectStorage::syncRevision(UInt64 revision)
+{
+    metadata_helper->syncRevision(revision);
+}
+
+UInt64 DiskObjectStorage::getRevision() const
+{
+    return metadata_helper->getRevision();
+}
+
+
+DiskPtr DiskObjectStorageReservation::getDisk(size_t i) const
+{
+    if (i != 0)
+        throw Exception("Can't use i != 0 with single disk reservation", ErrorCodes::INCORRECT_DISK_INDEX);
+    return disk;
+}
+
+void DiskObjectStorageReservation::update(UInt64 new_size)
+{
+    std::lock_guard lock(disk->reservation_mutex);
+    disk->reserved_bytes -= size;
+    size = new_size;
+    disk->reserved_bytes += size;
+}
+
+DiskObjectStorageReservation::~DiskObjectStorageReservation()
+{
+    try
+    {
+        std::lock_guard lock(disk->reservation_mutex);
+        if (disk->reserved_bytes < size)
+        {
+            disk->reserved_bytes = 0;
+            LOG_ERROR(disk->log, "Unbalanced reservations size for disk '{}'.", disk->getName());
+        }
+        else
+        {
+            disk->reserved_bytes -= size;
+        }
+
+        if (disk->reservation_count == 0)
+            LOG_ERROR(disk->log, "Unbalanced reservation count for disk '{}'.", disk->getName());
+        else
+            --disk->reservation_count;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+
+}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.h b/src/Disks/ObjectStorages/DiskObjectStorage.h
new file mode 100644
index 00000000000..e7e8869bff0
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.h
@@ -0,0 +1,232 @@
+#pragma once
+
+#include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Disks/ObjectStorages/DiskObjectStorageMetadataHelper.h>
+#include <Disks/ObjectStorages/DiskObjectStorageMetadata.h>
+#include <re2/re2.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric DiskSpaceReservedForMerge;
+}
+
+namespace DB
+{
+
+/// Disk build on top of IObjectStorage. Use additional disk (local for example)
+/// for metadata storage. Metadata is a small files with mapping from local paths to
+/// objects in object storage, like:
+/// "/var/lib/clickhouse/data/db/table/all_0_0_0/columns.txt" -> /xxxxxxxxxxxxxxxxxxxx
+///                                                           -> /yyyyyyyyyyyyyyyyyyyy
+class DiskObjectStorage : public IDisk
+{
+
+friend class DiskObjectStorageReservation;
+friend class DiskObjectStorageMetadataHelper;
+
+public:
+    DiskObjectStorage(
+        const String & name_,
+        const String & remote_fs_root_path_,
+        const String & log_name,
+        DiskPtr metadata_disk_,
+        ObjectStoragePtr && object_storage_,
+        DiskType disk_type_,
+        bool send_metadata_,
+        uint64_t thread_pool_size);
+
+    DiskType getType() const override { return disk_type; }
+
+    bool supportZeroCopyReplication() const override { return true; }
+
+    bool supportParallelWrite() const override { return true; }
+
+    using Metadata = DiskObjectStorageMetadata;
+    using MetadataUpdater = std::function<bool(Metadata & metadata)>;
+
+    const String & getName() const override { return name; }
+
+    const String & getPath() const override { return metadata_disk->getPath(); }
+
+    std::vector<String> getRemotePaths(const String & local_path) const override;
+
+    void getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithRemotePaths> & paths_map) override;
+
+    std::string getCacheBasePath() const override
+    {
+        return object_storage->getCacheBasePath();
+    }
+
+    /// Methods for working with metadata. For some operations (like hardlink
+    /// creation) metadata can be updated concurrently from multiple threads
+    /// (file actually rewritten on disk). So additional RW lock is required for
+    /// metadata read and write, but not for create new metadata.
+    Metadata readMetadata(const String & path) const;
+    Metadata readMetadataUnlocked(const String & path, std::shared_lock<std::shared_mutex> &) const;
+    Metadata readUpdateAndStoreMetadata(const String & path, bool sync, MetadataUpdater updater);
+    void readUpdateStoreMetadataAndRemove(const String & path, bool sync, MetadataUpdater updater);
+
+    Metadata readOrCreateUpdateAndStoreMetadata(const String & path, WriteMode mode, bool sync, MetadataUpdater updater);
+
+    Metadata createAndStoreMetadata(const String & path, bool sync);
+    Metadata createUpdateAndStoreMetadata(const String & path, bool sync, MetadataUpdater updater);
+
+    UInt64 getTotalSpace() const override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getAvailableSpace() const override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getUnreservedSpace() const override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getKeepingFreeSpace() const override { return 0; }
+
+    bool exists(const String & path) const override;
+
+    bool isFile(const String & path) const override;
+
+    void createFile(const String & path) override;
+
+    size_t getFileSize(const String & path) const override;
+
+    void moveFile(const String & from_path, const String & to_path) override;
+
+    void moveFile(const String & from_path, const String & to_path, bool should_send_metadata);
+
+    void replaceFile(const String & from_path, const String & to_path) override;
+
+    void removeFile(const String & path) override { removeSharedFile(path, false); }
+
+    void removeFileIfExists(const String & path) override { removeSharedFileIfExists(path, false); }
+
+    void removeRecursive(const String & path) override { removeSharedRecursive(path, false, {}); }
+
+    void removeSharedFile(const String & path, bool delete_metadata_only) override;
+
+    void removeSharedFileIfExists(const String & path, bool delete_metadata_only) override;
+
+    void removeSharedRecursive(const String & path, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override;
+
+    void removeFromRemoteFS(const std::vector<String> & paths);
+
+    DiskPtr getMetadataDiskIfExistsOrSelf() override { return metadata_disk; }
+
+    UInt32 getRefCount(const String & path) const override;
+
+    /// Return metadata for each file path. Also, before serialization reset
+    /// ref_count for each metadata to zero. This function used only for remote
+    /// fetches/sends in replicated engines. That's why we reset ref_count to zero.
+    std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & file_paths) const override;
+
+    String getUniqueId(const String & path) const override;
+
+    bool checkObjectExists(const String & path) const;
+    bool checkUniqueId(const String & id) const override;
+
+    void createHardLink(const String & src_path, const String & dst_path) override;
+    void createHardLink(const String & src_path, const String & dst_path, bool should_send_metadata);
+
+    void listFiles(const String & path, std::vector<String> & file_names) override;
+
+    void setReadOnly(const String & path) override;
+
+    bool isDirectory(const String & path) const override;
+
+    void createDirectory(const String & path) override;
+
+    void createDirectories(const String & path) override;
+
+    void clearDirectory(const String & path) override;
+
+    void moveDirectory(const String & from_path, const String & to_path) override { moveFile(from_path, to_path); }
+
+    void removeDirectory(const String & path) override;
+
+    DiskDirectoryIteratorPtr iterateDirectory(const String & path) override;
+
+    void setLastModified(const String & path, const Poco::Timestamp & timestamp) override;
+
+    Poco::Timestamp getLastModified(const String & path) override;
+
+    bool isRemote() const override { return true; }
+
+    void shutdown() override;
+
+    void startup(ContextPtr context) override;
+
+    ReservationPtr reserve(UInt64 bytes) override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readFile(
+        const String & path,
+        const ReadSettings & settings,
+        std::optional<size_t> read_hint,
+        std::optional<size_t> file_size) const override;
+
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(
+        const String & path,
+        size_t buf_size,
+        WriteMode mode,
+        const WriteSettings & settings) override;
+
+    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context_, const String &, const DisksMap &) override;
+
+    void restoreMetadataIfNeeded(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context);
+
+    void onFreeze(const String & path) override;
+
+    void syncRevision(UInt64 revision) override;
+
+    UInt64 getRevision() const override;
+private:
+    const String name;
+    const String remote_fs_root_path;
+    Poco::Logger * log;
+    DiskPtr metadata_disk;
+
+    const DiskType disk_type;
+    ObjectStoragePtr object_storage;
+
+    UInt64 reserved_bytes = 0;
+    UInt64 reservation_count = 0;
+    std::mutex reservation_mutex;
+
+    mutable std::shared_mutex metadata_mutex;
+    void removeMetadata(const String & path, std::vector<String> & paths_to_remove);
+
+    void removeMetadataRecursive(const String & path, std::unordered_map<String, std::vector<String>> & paths_to_remove);
+
+    std::optional<UInt64> tryReserve(UInt64 bytes);
+
+    bool send_metadata;
+
+    std::unique_ptr<DiskObjectStorageMetadataHelper> metadata_helper;
+};
+
+class DiskObjectStorageReservation final : public IReservation
+{
+public:
+    DiskObjectStorageReservation(const std::shared_ptr<DiskObjectStorage> & disk_, UInt64 size_)
+        : disk(disk_)
+        , size(size_)
+        , metric_increment(CurrentMetrics::DiskSpaceReservedForMerge, size_)
+    {}
+
+    UInt64 getSize() const override { return size; }
+
+    UInt64 getUnreservedSpace() const override { return unreserved_space; }
+
+    DiskPtr getDisk(size_t i) const override;
+
+    Disks getDisks() const override { return {disk}; }
+
+    void update(UInt64 new_size) override;
+
+    ~DiskObjectStorageReservation() override;
+
+private:
+    std::shared_ptr<DiskObjectStorage> disk;
+    UInt64 size;
+    UInt64 unreserved_space;
+    CurrentMetrics::Increment metric_increment;
+};
+
+}
diff --git a/src/Disks/RemoteDisksCommon.cpp b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
similarity index 97%
rename from src/Disks/RemoteDisksCommon.cpp
rename to src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
index da6ffed5f11..eb9d7107d39 100644
--- a/src/Disks/RemoteDisksCommon.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
@@ -1,4 +1,4 @@
-#include <Disks/RemoteDisksCommon.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/FileCacheFactory.h>
 #include <Common/FileCache.h>
@@ -8,7 +8,8 @@ namespace DB
 {
 
 namespace ErrorCodes
-{extern const int BAD_ARGUMENTS;
+{
+    extern const int BAD_ARGUMENTS;
 }
 
 std::shared_ptr<DiskCacheWrapper> wrapWithCache(
diff --git a/src/Disks/RemoteDisksCommon.h b/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
similarity index 85%
rename from src/Disks/RemoteDisksCommon.h
rename to src/Disks/ObjectStorages/DiskObjectStorageCommon.h
index 661d4e293df..9cc3b971865 100644
--- a/src/Disks/RemoteDisksCommon.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
@@ -2,18 +2,22 @@
 
 #include <random>
 #include <utility>
+
 #include <Core/Types.h>
 #include <Common/thread_local_rng.h>
-#include <Disks/IDisk.h>
-#include <Disks/DiskCacheWrapper.h>
 #include <Common/getRandomASCIIString.h>
 
+#include <Disks/IDisk.h>
+#include <Disks/DiskCacheWrapper.h>
 
 namespace DB
 {
 
 std::shared_ptr<DiskCacheWrapper> wrapWithCache(
-    std::shared_ptr<IDisk> disk, String cache_name, String cache_path, String metadata_path);
+    std::shared_ptr<IDisk> disk,
+    String cache_name,
+    String cache_path,
+    String metadata_path);
 
 std::pair<String, DiskPtr> prepareForLocalMetadata(
     const String & name,
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
new file mode 100644
index 00000000000..e863d811101
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
@@ -0,0 +1,218 @@
+#include <Disks/ObjectStorages/DiskObjectStorageMetadata.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_FORMAT;
+    extern const int PATH_ACCESS_DENIED;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int CANNOT_OPEN_FILE;
+}
+
+DiskObjectStorageMetadata DiskObjectStorageMetadata::readMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_)
+{
+    DiskObjectStorageMetadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
+    result.load();
+    return result;
+}
+
+
+DiskObjectStorageMetadata DiskObjectStorageMetadata::createAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync)
+{
+    DiskObjectStorageMetadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
+    result.save(sync);
+    return result;
+}
+
+DiskObjectStorageMetadata DiskObjectStorageMetadata::readUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, DiskObjectStorageMetadataUpdater updater)
+{
+    DiskObjectStorageMetadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
+    result.load();
+    if (updater(result))
+        result.save(sync);
+    return result;
+}
+
+DiskObjectStorageMetadata DiskObjectStorageMetadata::createUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, DiskObjectStorageMetadataUpdater updater)
+{
+    DiskObjectStorageMetadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
+    updater(result);
+    result.save(sync);
+    return result;
+}
+
+void DiskObjectStorageMetadata::readUpdateStoreMetadataAndRemove(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, DiskObjectStorageMetadataUpdater updater)
+{
+    /// Very often we are deleting metadata from some unfinished operation (like fetch of metadata)
+    /// in this case metadata file can be incomplete/empty and so on. It's ok to remove it in this case
+    /// because we cannot do anything better.
+    try
+    {
+        DiskObjectStorageMetadata metadata(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
+        metadata.load();
+        if (updater(metadata))
+            metadata.save(sync);
+
+        metadata_disk_->removeFile(metadata_file_path_);
+    }
+    catch (Exception & ex)
+    {
+        /// If we have some broken half-empty file just remove it
+        if (ex.code() == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF
+            || ex.code() == ErrorCodes::CANNOT_READ_ALL_DATA
+            || ex.code() == ErrorCodes::CANNOT_OPEN_FILE)
+        {
+            LOG_INFO(&Poco::Logger::get("ObjectStorageMetadata"), "Failed to read metadata file {} before removal because it's incomplete or empty. "
+                     "It's Ok and can happen after operation interruption (like metadata fetch), so removing as is", metadata_file_path_);
+            metadata_disk_->removeFile(metadata_file_path_);
+        }
+
+        /// If file already removed, than nothing to do
+        if (ex.code() == ErrorCodes::FILE_DOESNT_EXIST)
+            return;
+
+        throw;
+    }
+}
+
+DiskObjectStorageMetadata DiskObjectStorageMetadata::createAndStoreMetadataIfNotExists(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, bool overwrite)
+{
+    if (overwrite || !metadata_disk_->exists(metadata_file_path_))
+    {
+        return createAndStoreMetadata(remote_fs_root_path_, metadata_disk_, metadata_file_path_, sync);
+    }
+    else
+    {
+        auto result = readMetadata(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
+        if (result.read_only)
+            throw Exception("File is read-only: " + metadata_file_path_, ErrorCodes::PATH_ACCESS_DENIED);
+        return result;
+    }
+}
+
+void DiskObjectStorageMetadata::load()
+{
+    const ReadSettings read_settings;
+    auto buf = metadata_disk->readFile(metadata_file_path, read_settings, 1024);  /* reasonable buffer size for small file */
+
+    UInt32 version;
+    readIntText(version, *buf);
+
+    if (version < VERSION_ABSOLUTE_PATHS || version > VERSION_READ_ONLY_FLAG)
+        throw Exception(
+            ErrorCodes::UNKNOWN_FORMAT,
+            "Unknown metadata file version. Path: {}. Version: {}. Maximum expected version: {}",
+            metadata_disk->getPath() + metadata_file_path, toString(version), toString(VERSION_READ_ONLY_FLAG));
+
+    assertChar('\n', *buf);
+
+    UInt32 remote_fs_objects_count;
+    readIntText(remote_fs_objects_count, *buf);
+    assertChar('\t', *buf);
+    readIntText(total_size, *buf);
+    assertChar('\n', *buf);
+    remote_fs_objects.resize(remote_fs_objects_count);
+
+    for (size_t i = 0; i < remote_fs_objects_count; ++i)
+    {
+        String remote_fs_object_path;
+        size_t remote_fs_object_size;
+        readIntText(remote_fs_object_size, *buf);
+        assertChar('\t', *buf);
+        readEscapedString(remote_fs_object_path, *buf);
+        if (version == VERSION_ABSOLUTE_PATHS)
+        {
+            if (!remote_fs_object_path.starts_with(remote_fs_root_path))
+                throw Exception(ErrorCodes::UNKNOWN_FORMAT,
+                    "Path in metadata does not correspond to root path. Path: {}, root path: {}, disk path: {}",
+                    remote_fs_object_path, remote_fs_root_path, metadata_disk->getPath());
+
+            remote_fs_object_path = remote_fs_object_path.substr(remote_fs_root_path.size());
+        }
+        assertChar('\n', *buf);
+        remote_fs_objects[i].relative_path = remote_fs_object_path;
+        remote_fs_objects[i].bytes_size = remote_fs_object_size;
+    }
+
+    readIntText(ref_count, *buf);
+    assertChar('\n', *buf);
+
+    if (version >= VERSION_READ_ONLY_FLAG)
+    {
+        readBoolText(read_only, *buf);
+        assertChar('\n', *buf);
+    }
+}
+
+/// Load metadata by path or create empty if `create` flag is set.
+DiskObjectStorageMetadata::DiskObjectStorageMetadata(
+        const String & remote_fs_root_path_,
+        DiskPtr metadata_disk_,
+        const String & metadata_file_path_)
+    : remote_fs_root_path(remote_fs_root_path_)
+    , metadata_file_path(metadata_file_path_)
+    , metadata_disk(metadata_disk_)
+    , total_size(0), ref_count(0)
+{
+}
+
+void DiskObjectStorageMetadata::addObject(const String & path, size_t size)
+{
+    total_size += size;
+    remote_fs_objects.emplace_back(path, size);
+}
+
+
+void DiskObjectStorageMetadata::saveToBuffer(WriteBuffer & buf, bool sync)
+{
+    writeIntText(VERSION_RELATIVE_PATHS, buf);
+    writeChar('\n', buf);
+
+    writeIntText(remote_fs_objects.size(), buf);
+    writeChar('\t', buf);
+    writeIntText(total_size, buf);
+    writeChar('\n', buf);
+
+    for (const auto & [remote_fs_object_path, remote_fs_object_size] : remote_fs_objects)
+    {
+        writeIntText(remote_fs_object_size, buf);
+        writeChar('\t', buf);
+        writeEscapedString(remote_fs_object_path, buf);
+        writeChar('\n', buf);
+    }
+
+    writeIntText(ref_count, buf);
+    writeChar('\n', buf);
+
+    writeBoolText(read_only, buf);
+    writeChar('\n', buf);
+
+    buf.finalize();
+    if (sync)
+        buf.sync();
+
+}
+
+/// Fsync metadata file if 'sync' flag is set.
+void DiskObjectStorageMetadata::save(bool sync)
+{
+    auto buf = metadata_disk->writeFile(metadata_file_path, 1024);
+    saveToBuffer(*buf, sync);
+}
+
+std::string DiskObjectStorageMetadata::serializeToString()
+{
+    WriteBufferFromOwnString write_buf;
+    saveToBuffer(write_buf, false);
+    return write_buf.str();
+}
+
+
+}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h
new file mode 100644
index 00000000000..d6e791bd53f
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include <Disks/IDisk.h>
+#include <Core/Types.h>
+
+namespace DB
+{
+
+/// Metadata for DiskObjectStorage, stored on local disk
+struct DiskObjectStorageMetadata
+{
+    using Updater = std::function<bool(DiskObjectStorageMetadata & metadata)>;
+    /// Metadata file version.
+    static constexpr UInt32 VERSION_ABSOLUTE_PATHS = 1;
+    static constexpr UInt32 VERSION_RELATIVE_PATHS = 2;
+    static constexpr UInt32 VERSION_READ_ONLY_FLAG = 3;
+
+    /// Remote FS objects paths and their sizes.
+    std::vector<BlobPathWithSize> remote_fs_objects;
+
+    /// URI
+    const String & remote_fs_root_path;
+
+    /// Relative path to metadata file on local FS.
+    const String metadata_file_path;
+
+    DiskPtr metadata_disk;
+
+    /// Total size of all remote FS (S3, HDFS) objects.
+    size_t total_size = 0;
+
+    /// Number of references (hardlinks) to this metadata file.
+    ///
+    /// FIXME: Why we are tracking it explicetly, without
+    /// info from filesystem????
+    UInt32 ref_count = 0;
+
+    /// Flag indicates that file is read only.
+    bool read_only = false;
+
+    DiskObjectStorageMetadata(
+        const String & remote_fs_root_path_,
+        DiskPtr metadata_disk_,
+        const String & metadata_file_path_);
+
+    void addObject(const String & path, size_t size);
+
+    static DiskObjectStorageMetadata readMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_);
+    static DiskObjectStorageMetadata readUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, Updater updater);
+    static void readUpdateStoreMetadataAndRemove(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, Updater updater);
+
+    static DiskObjectStorageMetadata createAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync);
+    static DiskObjectStorageMetadata createUpdateAndStoreMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, Updater updater);
+    static DiskObjectStorageMetadata createAndStoreMetadataIfNotExists(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_, bool sync, bool overwrite);
+
+    /// Serialize metadata to string (very same with saveToBuffer)
+    std::string serializeToString();
+
+private:
+    /// Fsync metadata file if 'sync' flag is set.
+    void save(bool sync = false);
+    void saveToBuffer(WriteBuffer & buffer, bool sync);
+    void load();
+};
+
+using DiskObjectStorageMetadataUpdater = std::function<bool(DiskObjectStorageMetadata & metadata)>;
+
+}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadataHelper.cpp b/src/Disks/ObjectStorages/DiskObjectStorageMetadataHelper.cpp
new file mode 100644
index 00000000000..a36c987db7d
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadataHelper.cpp
@@ -0,0 +1,571 @@
+#include <Disks/ObjectStorages/DiskObjectStorageMetadataHelper.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadBufferFromString.h>
+#include <Common/checkStackSize.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_FORMAT;
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+}
+
+static String revisionToString(UInt64 revision)
+{
+    return std::bitset<64>(revision).to_string();
+}
+
+void DiskObjectStorageMetadataHelper::createFileOperationObject(const String & operation_name, UInt64 revision, const ObjectAttributes & metadata) const
+{
+    const String path = disk->remote_fs_root_path + "operations/r" + revisionToString(revision) + operation_log_suffix + "-" + operation_name;
+    auto buf = disk->object_storage->writeObject(path, WriteMode::Rewrite, metadata);
+    buf->write('0');
+    buf->finalize();
+}
+
+void DiskObjectStorageMetadataHelper::findLastRevision()
+{
+    /// Construct revision number from high to low bits.
+    String revision;
+    revision.reserve(64);
+    for (int bit = 0; bit < 64; ++bit)
+    {
+        auto revision_prefix = revision + "1";
+
+        LOG_TRACE(disk->log, "Check object exists with revision prefix {}", revision_prefix);
+
+        /// Check file or operation with such revision prefix exists.
+        if (disk->object_storage->exists(disk->remote_fs_root_path + "r" + revision_prefix)
+            || disk->object_storage->exists(disk->remote_fs_root_path + "operations/r" + revision_prefix))
+            revision += "1";
+        else
+            revision += "0";
+    }
+    revision_counter = static_cast<UInt64>(std::bitset<64>(revision).to_ullong());
+    LOG_INFO(disk->log, "Found last revision number {} for disk {}", revision_counter, disk->name);
+}
+
+int DiskObjectStorageMetadataHelper::readSchemaVersion(IObjectStorage * object_storage, const String & source_path)
+{
+    const std::string path = source_path + SCHEMA_VERSION_OBJECT;
+    int version = 0;
+    if (!object_storage->exists(path))
+        return version;
+
+    auto buf = object_storage->readObject(path);
+    readIntText(version, *buf);
+
+    return version;
+}
+
+void DiskObjectStorageMetadataHelper::saveSchemaVersion(const int & version) const
+{
+    auto path = disk->remote_fs_root_path + SCHEMA_VERSION_OBJECT;
+
+    auto buf = disk->object_storage->writeObject(path, WriteMode::Rewrite);
+    writeIntText(version, *buf);
+    buf->finalize();
+
+}
+
+void DiskObjectStorageMetadataHelper::updateObjectMetadata(const String & key, const ObjectAttributes & metadata) const
+{
+    disk->object_storage->copyObject(key, key, metadata);
+}
+
+void DiskObjectStorageMetadataHelper::migrateFileToRestorableSchema(const String & path) const
+{
+    LOG_TRACE(disk->log, "Migrate file {} to restorable schema", disk->metadata_disk->getPath() + path);
+
+    auto meta = disk->readMetadata(path);
+
+    for (const auto & [key, _] : meta.remote_fs_objects)
+    {
+        ObjectAttributes metadata {
+            {"path", path}
+        };
+        updateObjectMetadata(disk->remote_fs_root_path + key, metadata);
+    }
+}
+void DiskObjectStorageMetadataHelper::migrateToRestorableSchemaRecursive(const String & path, Futures & results)
+{
+    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
+
+    LOG_TRACE(disk->log, "Migrate directory {} to restorable schema", disk->metadata_disk->getPath() + path);
+
+    bool dir_contains_only_files = true;
+    for (auto it = disk->iterateDirectory(path); it->isValid(); it->next())
+    {
+        if (disk->isDirectory(it->path()))
+        {
+            dir_contains_only_files = false;
+            break;
+        }
+    }
+
+    /// The whole directory can be migrated asynchronously.
+    if (dir_contains_only_files)
+    {
+        auto result = disk->getExecutor().execute([this, path]
+        {
+            for (auto it = disk->iterateDirectory(path); it->isValid(); it->next())
+                migrateFileToRestorableSchema(it->path());
+        });
+
+        results.push_back(std::move(result));
+    }
+    else
+    {
+        for (auto it = disk->iterateDirectory(path); it->isValid(); it->next())
+            if (!disk->isDirectory(it->path()))
+            {
+                auto source_path = it->path();
+                auto result = disk->getExecutor().execute([this, source_path]
+                    {
+                        migrateFileToRestorableSchema(source_path);
+                    });
+
+                results.push_back(std::move(result));
+            }
+            else
+                migrateToRestorableSchemaRecursive(it->path(), results);
+    }
+
+}
+
+void DiskObjectStorageMetadataHelper::migrateToRestorableSchema()
+{
+    try
+    {
+        LOG_INFO(disk->log, "Start migration to restorable schema for disk {}", disk->name);
+
+        Futures results;
+
+        for (const auto & root : data_roots)
+            if (disk->exists(root))
+                migrateToRestorableSchemaRecursive(root + '/', results);
+
+        for (auto & result : results)
+            result.wait();
+        for (auto & result : results)
+            result.get();
+
+        saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
+    }
+    catch (const Exception &)
+    {
+        tryLogCurrentException(disk->log, fmt::format("Failed to migrate to restorable schema for disk {}", disk->name));
+
+        throw;
+    }
+}
+
+void DiskObjectStorageMetadataHelper::restore(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    LOG_INFO(disk->log, "Restore operation for disk {} called", disk->name);
+
+    if (!disk->exists(RESTORE_FILE_NAME))
+    {
+        LOG_INFO(disk->log, "No restore file '{}' exists, finishing restore", RESTORE_FILE_NAME);
+        return;
+    }
+
+    try
+    {
+        RestoreInformation information;
+        information.source_path = disk->remote_fs_root_path;
+        information.source_namespace = disk->object_storage->getObjectsNamespace();
+
+        readRestoreInformation(information);
+        if (information.revision == 0)
+            information.revision = LATEST_REVISION;
+        if (!information.source_path.ends_with('/'))
+            information.source_path += '/';
+
+        IObjectStorage * source_object_storage = disk->object_storage.get();
+        if (information.source_namespace == disk->object_storage->getObjectsNamespace())
+        {
+            /// In this case we need to additionally cleanup S3 from objects with later revision.
+            /// Will be simply just restore to different path.
+            if (information.source_path == disk->remote_fs_root_path && information.revision != LATEST_REVISION)
+                throw Exception("Restoring to the same bucket and path is allowed if revision is latest (0)", ErrorCodes::BAD_ARGUMENTS);
+
+            /// This case complicates S3 cleanup in case of unsuccessful restore.
+            if (information.source_path != disk->remote_fs_root_path && disk->remote_fs_root_path.starts_with(information.source_path))
+                throw Exception("Restoring to the same bucket is allowed only if source path is not a sub-path of configured path in S3 disk", ErrorCodes::BAD_ARGUMENTS);
+        }
+        else
+        {
+            object_storage_from_another_namespace = disk->object_storage->cloneObjectStorage(information.source_namespace, config, config_prefix, context);
+            source_object_storage = object_storage_from_another_namespace.get();
+        }
+
+        LOG_INFO(disk->log, "Starting to restore disk {}. Revision: {}, Source path: {}",
+                 disk->name, information.revision, information.source_path);
+
+        if (readSchemaVersion(source_object_storage, information.source_path) < RESTORABLE_SCHEMA_VERSION)
+            throw Exception("Source bucket doesn't have restorable schema.", ErrorCodes::BAD_ARGUMENTS);
+
+        LOG_INFO(disk->log, "Removing old metadata...");
+
+        bool cleanup_s3 = information.source_path != disk->remote_fs_root_path;
+        for (const auto & root : data_roots)
+            if (disk->exists(root))
+                disk->removeSharedRecursive(root + '/', !cleanup_s3, {});
+
+        LOG_INFO(disk->log, "Old metadata removed, restoring new one");
+        restoreFiles(source_object_storage, information);
+        restoreFileOperations(source_object_storage, information);
+
+        disk->metadata_disk->removeFile(RESTORE_FILE_NAME);
+
+        saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
+
+        LOG_INFO(disk->log, "Restore disk {} finished", disk->name);
+    }
+    catch (const Exception &)
+    {
+        tryLogCurrentException(disk->log, fmt::format("Failed to restore disk {}", disk->name));
+
+        throw;
+    }
+}
+
+void DiskObjectStorageMetadataHelper::readRestoreInformation(RestoreInformation & restore_information) /// NOLINT
+{
+    auto buffer = disk->metadata_disk->readFile(RESTORE_FILE_NAME, ReadSettings{}, 512);
+    buffer->next();
+
+    try
+    {
+        std::map<String, String> properties;
+
+        while (buffer->hasPendingData())
+        {
+            String property;
+            readText(property, *buffer);
+            assertChar('\n', *buffer);
+
+            auto pos = property.find('=');
+            if (pos == std::string::npos || pos == 0 || pos == property.length())
+                throw Exception(fmt::format("Invalid property {} in restore file", property), ErrorCodes::UNKNOWN_FORMAT);
+
+            auto key = property.substr(0, pos);
+            auto value = property.substr(pos + 1);
+
+            auto it = properties.find(key);
+            if (it != properties.end())
+                throw Exception(fmt::format("Property key duplication {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
+
+            properties[key] = value;
+        }
+
+        for (const auto & [key, value] : properties)
+        {
+            ReadBufferFromString value_buffer(value);
+
+            if (key == "revision")
+                readIntText(restore_information.revision, value_buffer);
+            else if (key == "source_bucket" || key == "source_namespace")
+                readText(restore_information.source_namespace, value_buffer);
+            else if (key == "source_path")
+                readText(restore_information.source_path, value_buffer);
+            else if (key == "detached")
+                readBoolTextWord(restore_information.detached, value_buffer);
+            else
+                throw Exception(fmt::format("Unknown key {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
+        }
+    }
+    catch (const Exception &)
+    {
+        tryLogCurrentException(disk->log, "Failed to read restore information");
+        throw;
+    }
+}
+
+static String shrinkKey(const String & path, const String & key)
+{
+    if (!key.starts_with(path))
+        throw Exception("The key " + key + " prefix mismatch with given " + path, ErrorCodes::LOGICAL_ERROR);
+
+    return key.substr(path.length());
+}
+
+static std::tuple<UInt64, String> extractRevisionAndOperationFromKey(const String & key)
+{
+    String revision_str;
+    String suffix;
+    String operation;
+    /// Key has format: ../../r{revision}(-{hostname})-{operation}
+    static const re2::RE2 key_regexp{R"(.*/r(\d+)(-[\w\d\-\.]+)?-(\w+)$)"};
+
+    re2::RE2::FullMatch(key, key_regexp, &revision_str, &suffix, &operation);
+
+    return {(revision_str.empty() ? 0 : static_cast<UInt64>(std::bitset<64>(revision_str).to_ullong())), operation};
+}
+
+void DiskObjectStorageMetadataHelper::moveRecursiveOrRemove(const String & from_path, const String & to_path, bool send_metadata)
+{
+    if (disk->exists(to_path))
+    {
+        if (send_metadata)
+        {
+            auto revision = ++revision_counter;
+            const ObjectAttributes object_metadata {
+                {"from_path", from_path},
+                {"to_path", to_path}
+            };
+            createFileOperationObject("rename", revision, object_metadata);
+        }
+        if (disk->isDirectory(from_path))
+        {
+            for (auto it = disk->iterateDirectory(from_path); it->isValid(); it->next())
+                moveRecursiveOrRemove(it->path(), fs::path(to_path) / it->name(), false);
+        }
+        else
+        {
+            disk->removeFile(from_path);
+        }
+    }
+    else
+    {
+        disk->moveFile(from_path, to_path, send_metadata);
+    }
+}
+
+void DiskObjectStorageMetadataHelper::restoreFiles(IObjectStorage * source_object_storage, const RestoreInformation & restore_information)
+{
+    LOG_INFO(disk->log, "Starting restore files for disk {}", disk->name);
+
+    std::vector<std::future<void>> results;
+    auto restore_files = [this, &source_object_storage, &restore_information, &results](const BlobsPathToSize & keys)
+    {
+        std::vector<String> keys_names;
+        for (const auto & [key, size] : keys)
+        {
+
+            LOG_INFO(disk->log, "Calling restore for key for disk {}", key);
+
+            /// Skip file operations objects. They will be processed separately.
+            if (key.find("/operations/") != String::npos)
+                continue;
+
+            const auto [revision, _] = extractRevisionAndOperationFromKey(key);
+            /// Filter early if it's possible to get revision from key.
+            if (revision > restore_information.revision)
+                continue;
+
+            keys_names.push_back(key);
+        }
+
+        if (!keys_names.empty())
+        {
+            auto result = disk->getExecutor().execute([this, &source_object_storage, &restore_information, keys_names]()
+            {
+                processRestoreFiles(source_object_storage, restore_information.source_path, keys_names);
+            });
+
+            results.push_back(std::move(result));
+        }
+
+        return true;
+    };
+
+    BlobsPathToSize children;
+    source_object_storage->listPrefix(restore_information.source_path, children);
+
+    restore_files(children);
+
+    for (auto & result : results)
+        result.wait();
+    for (auto & result : results)
+        result.get();
+
+    LOG_INFO(disk->log, "Files are restored for disk {}", disk->name);
+
+}
+
+void DiskObjectStorageMetadataHelper::processRestoreFiles(IObjectStorage * source_object_storage, const String & source_path, const std::vector<String> & keys) const
+{
+    for (const auto & key : keys)
+    {
+        auto meta = source_object_storage->getObjectMetadata(key);
+        auto object_attributes = meta.attributes;
+
+        String path;
+        if (object_attributes.has_value())
+        {
+            /// Restore file if object has 'path' in metadata.
+            auto path_entry = object_attributes->find("path");
+            if (path_entry == object_attributes->end())
+            {
+                /// Such keys can remain after migration, we can skip them.
+                LOG_WARNING(disk->log, "Skip key {} because it doesn't have 'path' in metadata", key);
+                continue;
+            }
+
+            path = path_entry->second;
+        }
+        else
+            continue;
+
+        disk->createDirectories(directoryPath(path));
+        auto relative_key = shrinkKey(source_path, key);
+
+        /// Copy object if we restore to different bucket / path.
+        if (source_object_storage->getObjectsNamespace() != disk->object_storage->getObjectsNamespace() || disk->remote_fs_root_path != source_path)
+            source_object_storage->copyObjectToAnotherObjectStorage(key, disk->remote_fs_root_path + relative_key, *disk->object_storage);
+
+        auto updater = [relative_key, meta] (DiskObjectStorage::Metadata & metadata)
+        {
+            metadata.addObject(relative_key, meta.size_bytes);
+            return true;
+        };
+
+        disk->createUpdateAndStoreMetadata(path, false, updater);
+
+        LOG_TRACE(disk->log, "Restored file {}", path);
+    }
+
+}
+
+void DiskObjectStorage::onFreeze(const String & path)
+{
+    createDirectories(path);
+    auto revision_file_buf = metadata_disk->writeFile(path + "revision.txt", 32);
+    writeIntText(metadata_helper->revision_counter.load(), *revision_file_buf);
+    revision_file_buf->finalize();
+}
+
+static String pathToDetached(const String & source_path)
+{
+    if (source_path.ends_with('/'))
+        return fs::path(source_path).parent_path().parent_path() / "detached/";
+    return fs::path(source_path).parent_path() / "detached/";
+}
+
+void DiskObjectStorageMetadataHelper::restoreFileOperations(IObjectStorage * source_object_storage, const RestoreInformation & restore_information)
+{
+    /// Enable recording file operations if we restore to different bucket / path.
+    bool send_metadata = source_object_storage->getObjectsNamespace() != disk->object_storage->getObjectsNamespace() || disk->remote_fs_root_path != restore_information.source_path;
+
+    std::set<String> renames;
+    auto restore_file_operations = [this, &source_object_storage, &restore_information, &renames, &send_metadata](const BlobsPathToSize & keys)
+    {
+        const String rename = "rename";
+        const String hardlink = "hardlink";
+
+        for (const auto & [key, _]: keys)
+        {
+            const auto [revision, operation] = extractRevisionAndOperationFromKey(key);
+            if (revision == UNKNOWN_REVISION)
+            {
+                LOG_WARNING(disk->log, "Skip key {} with unknown revision", key);
+                continue;
+            }
+
+            /// S3 ensures that keys will be listed in ascending UTF-8 bytes order (revision order).
+            /// We can stop processing if revision of the object is already more than required.
+            if (revision > restore_information.revision)
+                return false;
+
+            /// Keep original revision if restore to different bucket / path.
+            if (send_metadata)
+                revision_counter = revision - 1;
+
+            auto object_attributes = *(source_object_storage->getObjectMetadata(key).attributes);
+            if (operation == rename)
+            {
+                auto from_path = object_attributes["from_path"];
+                auto to_path = object_attributes["to_path"];
+                if (disk->exists(from_path))
+                {
+                    moveRecursiveOrRemove(from_path, to_path, send_metadata);
+
+                    LOG_TRACE(disk->log, "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
+
+                    if (restore_information.detached && disk->isDirectory(to_path))
+                    {
+                        /// Sometimes directory paths are passed without trailing '/'. We should keep them in one consistent way.
+                        if (!from_path.ends_with('/'))
+                            from_path += '/';
+                        if (!to_path.ends_with('/'))
+                            to_path += '/';
+
+                        /// Always keep latest actual directory path to avoid 'detaching' not existing paths.
+                        auto it = renames.find(from_path);
+                        if (it != renames.end())
+                            renames.erase(it);
+
+                        renames.insert(to_path);
+                    }
+                }
+            }
+            else if (operation == hardlink)
+            {
+                auto src_path = object_attributes["src_path"];
+                auto dst_path = object_attributes["dst_path"];
+                if (disk->exists(src_path))
+                {
+                    disk->createDirectories(directoryPath(dst_path));
+                    disk->createHardLink(src_path, dst_path, send_metadata);
+                    LOG_TRACE(disk->log, "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
+                }
+            }
+        }
+
+        return true;
+    };
+
+    BlobsPathToSize children;
+    source_object_storage->listPrefix(restore_information.source_path + "operations/", children);
+    restore_file_operations(children);
+
+    if (restore_information.detached)
+    {
+        Strings not_finished_prefixes{"tmp_", "delete_tmp_", "attaching_", "deleting_"};
+
+        for (const auto & path : renames)
+        {
+            /// Skip already detached parts.
+            if (path.find("/detached/") != std::string::npos)
+                continue;
+
+            /// Skip not finished parts. They shouldn't be in 'detached' directory, because CH wouldn't be able to finish processing them.
+            fs::path directory_path(path);
+            auto directory_name = directory_path.parent_path().filename().string();
+
+            auto predicate = [&directory_name](String & prefix) { return directory_name.starts_with(prefix); };
+            if (std::any_of(not_finished_prefixes.begin(), not_finished_prefixes.end(), predicate))
+                continue;
+
+            auto detached_path = pathToDetached(path);
+
+            LOG_TRACE(disk->log, "Move directory to 'detached' {} -> {}", path, detached_path);
+
+            fs::path from_path = fs::path(path);
+            fs::path to_path = fs::path(detached_path);
+            if (path.ends_with('/'))
+                to_path /= from_path.parent_path().filename();
+            else
+                to_path /= from_path.filename();
+
+            /// to_path may exist and non-empty in case for example abrupt restart, so remove it before rename
+            if (disk->metadata_disk->exists(to_path))
+                disk->metadata_disk->removeRecursive(to_path);
+
+            disk->createDirectories(directoryPath(to_path));
+            disk->metadata_disk->moveDirectory(from_path, to_path);
+        }
+    }
+
+    LOG_INFO(disk->log, "File operations restored for disk {}", disk->name);
+}
+
+}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadataHelper.h b/src/Disks/ObjectStorages/DiskObjectStorageMetadataHelper.h
new file mode 100644
index 00000000000..58ef8405a13
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadataHelper.h
@@ -0,0 +1,100 @@
+#pragma once
+
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <base/getFQDNOrHostName.h>
+
+namespace DB
+{
+
+class DiskObjectStorage;
+
+/// Class implements storage of ObjectStorage metadata inside object storage itself,
+/// so it's possible to recover from this remote information in case of local disk loss.
+///
+/// This mechanism can be enabled with `<send_metadata>true</send_metadata>` option inside
+/// disk configuration. Implemented only for S3 and Azure Blob storage. Other object storages
+/// don't support metadata for blobs.
+///
+/// FIXME: this class is very intrusive and use a lot of DiskObjectStorage internals.
+/// FIXME: it's very complex and unreliable, need to implement something better.
+class DiskObjectStorageMetadataHelper
+{
+public:
+    static constexpr UInt64 LATEST_REVISION = std::numeric_limits<UInt64>::max();
+    static constexpr UInt64 UNKNOWN_REVISION = 0;
+
+    DiskObjectStorageMetadataHelper(DiskObjectStorage * disk_, ReadSettings read_settings_)
+        : disk(disk_)
+        , read_settings(std::move(read_settings_))
+        , operation_log_suffix("-" + getFQDNOrHostName())
+    {
+    }
+
+    /// Most important method, called on DiskObjectStorage startup
+    void restore(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context);
+
+    void syncRevision(UInt64 revision)
+    {
+        UInt64 local_revision = revision_counter.load();
+        while ((revision > local_revision) && revision_counter.compare_exchange_weak(local_revision, revision));
+    }
+
+    UInt64 getRevision() const
+    {
+        return revision_counter.load();
+    }
+
+    static int readSchemaVersion(IObjectStorage * object_storage, const String & source_path);
+
+    void migrateToRestorableSchema();
+
+    void findLastRevision();
+
+    void createFileOperationObject(const String & operation_name, UInt64 revision, const ObjectAttributes & metadata) const;
+
+    /// Version with possibility to backup-restore metadata.
+    static constexpr int RESTORABLE_SCHEMA_VERSION = 1;
+
+    std::atomic<UInt64> revision_counter = 0;
+private:
+    struct RestoreInformation
+    {
+        UInt64 revision = LATEST_REVISION;
+        String source_namespace;
+        String source_path;
+        bool detached = false;
+    };
+
+    using Futures = std::vector<std::future<void>>;
+
+    /// Move file or files in directory when possible and remove files in other case
+    /// to restore by S3 operation log with same operations from different replicas
+    void moveRecursiveOrRemove(const String & from_path, const String & to_path, bool send_metadata);
+
+    void saveSchemaVersion(const int & version) const;
+    void updateObjectMetadata(const String & key, const ObjectAttributes & metadata) const;
+    void migrateFileToRestorableSchema(const String & path) const;
+    void migrateToRestorableSchemaRecursive(const String & path, Futures & results);
+
+    void readRestoreInformation(RestoreInformation & restore_information);
+    void restoreFiles(IObjectStorage * source_object_storage, const RestoreInformation & restore_information);
+    void processRestoreFiles(IObjectStorage * source_object_storage, const String & source_path, const std::vector<String> & keys) const;
+    void restoreFileOperations(IObjectStorage * source_object_storage, const RestoreInformation & restore_information);
+
+    inline static const String RESTORE_FILE_NAME = "restore";
+
+    /// Object contains information about schema version.
+    inline static const String SCHEMA_VERSION_OBJECT = ".SCHEMA_VERSION";
+    /// Directories with data.
+    const std::vector<String> data_roots {"data", "store"};
+
+    DiskObjectStorage * disk;
+
+    ObjectStoragePtr object_storage_from_another_namespace;
+
+    ReadSettings read_settings;
+
+    String operation_log_suffix;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
new file mode 100644
index 00000000000..4574b8cb52c
--- /dev/null
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
@@ -0,0 +1,156 @@
+#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
+
+#include <IO/SeekAvoidingReadBuffer.h>
+#include <IO/copyData.h>
+
+#include <Storages/HDFS/WriteBufferFromHDFS.h>
+#include <Storages/HDFS/HDFSCommon.h>
+
+#include <Storages/HDFS/ReadBufferFromHDFS.h>
+#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+
+
+#if USE_HDFS
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+    extern const int HDFS_ERROR;
+}
+
+void HDFSObjectStorage::shutdown()
+{
+}
+
+void HDFSObjectStorage::startup()
+{
+}
+
+bool HDFSObjectStorage::exists(const std::string & hdfs_uri) const
+{
+    const size_t begin_of_path = hdfs_uri.find('/', hdfs_uri.find("//") + 2);
+    const String remote_fs_object_path = hdfs_uri.substr(begin_of_path);
+    return (0 == hdfsExists(hdfs_fs.get(), remote_fs_object_path.c_str()));
+}
+
+std::unique_ptr<SeekableReadBuffer> HDFSObjectStorage::readObject( /// NOLINT
+    const std::string & path,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+    return std::make_unique<ReadBufferFromHDFS>(path, path, config, read_settings.remote_fs_buffer_size);
+}
+
+std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObjects( /// NOLINT
+    const std::string & common_path_prefix,
+    const BlobsPathToSize & blobs_to_read,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+    auto hdfs_impl = std::make_unique<ReadBufferFromHDFSGather>(config, common_path_prefix, common_path_prefix, blobs_to_read, read_settings);
+    auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(hdfs_impl));
+    return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings->min_bytes_for_seek);
+}
+
+std::unique_ptr<WriteBufferFromFileBase> HDFSObjectStorage::writeObject( /// NOLINT
+    const std::string & path,
+    WriteMode mode,
+    std::optional<ObjectAttributes> attributes,
+    FinalizeCallback && finalize_callback,
+    size_t buf_size,
+    const WriteSettings &)
+{
+    if (attributes.has_value())
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "HDFS API doesn't support custom attributes/metadata for stored objects");
+
+    /// Single O_WRONLY in libhdfs adds O_TRUNC
+    auto hdfs_buffer = std::make_unique<WriteBufferFromHDFS>(
+        path, config, settings->replication, buf_size,
+        mode == WriteMode::Rewrite ? O_WRONLY : O_WRONLY | O_APPEND);
+
+    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(hdfs_buffer), std::move(finalize_callback), path);
+}
+
+
+void HDFSObjectStorage::listPrefix(const std::string & path, BlobsPathToSize & children) const
+{
+    const size_t begin_of_path = path.find('/', path.find("//") + 2);
+    int32_t num_entries;
+    auto * files_list = hdfsListDirectory(hdfs_fs.get(), path.substr(begin_of_path).c_str(), &num_entries);
+    if (num_entries == -1)
+        throw Exception(ErrorCodes::HDFS_ERROR, "HDFSDelete failed with path: " + path);
+
+    for (int32_t i = 0; i < num_entries; ++i)
+        children.emplace_back(files_list[i].mName, files_list[i].mSize);
+}
+
+/// Remove file. Throws exception if file doesn't exists or it's a directory.
+void HDFSObjectStorage::removeObject(const std::string & path)
+{
+    const size_t begin_of_path = path.find('/', path.find("//") + 2);
+
+    /// Add path from root to file name
+    int res = hdfsDelete(hdfs_fs.get(), path.substr(begin_of_path).c_str(), 0);
+    if (res == -1)
+        throw Exception(ErrorCodes::HDFS_ERROR, "HDFSDelete failed with path: " + path);
+
+}
+
+void HDFSObjectStorage::removeObjects(const std::vector<std::string> & paths)
+{
+    for (const auto & hdfs_path : paths)
+        removeObject(hdfs_path);
+}
+
+void HDFSObjectStorage::removeObjectIfExists(const std::string & path)
+{
+    if (exists(path))
+        removeObject(path);
+}
+
+void HDFSObjectStorage::removeObjectsIfExist(const std::vector<std::string> & paths)
+{
+    for (const auto & hdfs_path : paths)
+        removeObjectIfExists(hdfs_path);
+}
+
+ObjectMetadata HDFSObjectStorage::getObjectMetadata(const std::string &) const
+{
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "HDFS API doesn't support custom attributes/metadata for stored objects");
+}
+
+void HDFSObjectStorage::copyObject( /// NOLINT
+    const std::string & object_from,
+    const std::string & object_to,
+    std::optional<ObjectAttributes> object_to_attributes)
+{
+    if (object_to_attributes.has_value())
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "HDFS API doesn't support custom attributes/metadata for stored objects");
+
+    auto in = readObject(object_from);
+    auto out = writeObject(object_to, WriteMode::Rewrite);
+    copyData(*in, *out);
+    out->finalize();
+}
+
+
+void HDFSObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguration &, const std::string &, ContextPtr)
+{
+}
+
+std::unique_ptr<IObjectStorage> HDFSObjectStorage::cloneObjectStorage(const std::string &, const Poco::Util::AbstractConfiguration &, const std::string &, ContextPtr)
+{
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "HDFS object storage doesn't support cloning");
+}
+
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
new file mode 100644
index 00000000000..a9a223a3d7e
--- /dev/null
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
@@ -0,0 +1,119 @@
+#pragma once
+#include <Common/config.h>
+
+
+#if USE_HDFS
+
+#include <Disks/IDisk.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Storages/HDFS/HDFSCommon.h>
+#include <Core/UUID.h>
+#include <memory>
+#include <Poco/Util/AbstractConfiguration.h>
+
+namespace DB
+{
+
+struct HDFSObjectStorageSettings
+{
+
+    HDFSObjectStorageSettings() = default;
+
+    size_t min_bytes_for_seek;
+    int objects_chunk_size_to_delete;
+    int replication;
+
+    HDFSObjectStorageSettings(
+            int min_bytes_for_seek_,
+            int objects_chunk_size_to_delete_,
+            int replication_)
+        : min_bytes_for_seek(min_bytes_for_seek_)
+        , objects_chunk_size_to_delete(objects_chunk_size_to_delete_)
+        , replication(replication_)
+    {}
+};
+
+
+class HDFSObjectStorage : public IObjectStorage
+{
+public:
+
+    using SettingsPtr = std::unique_ptr<HDFSObjectStorageSettings>;
+
+    HDFSObjectStorage(
+        FileCachePtr && cache_,
+        const String & hdfs_root_path_,
+        SettingsPtr settings_,
+        const Poco::Util::AbstractConfiguration & config_)
+        : IObjectStorage(std::move(cache_))
+        , config(config_)
+        , hdfs_builder(createHDFSBuilder(hdfs_root_path_, config))
+        , hdfs_fs(createHDFSFS(hdfs_builder.get()))
+        , settings(std::move(settings_))
+    {}
+
+    bool exists(const std::string & hdfs_uri) const override;
+
+    std::unique_ptr<SeekableReadBuffer> readObject( /// NOLINT
+        const std::string & path,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObjects( /// NOLINT
+        const std::string & common_path_prefix,
+        const BlobsPathToSize & blobs_to_read,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    std::unique_ptr<WriteBufferFromFileBase> writeObject( /// NOLINT
+        const std::string & path,
+        WriteMode mode,
+        std::optional<ObjectAttributes> attributes = {},
+        FinalizeCallback && finalize_callback = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        const WriteSettings & write_settings = {}) override;
+
+    void listPrefix(const std::string & path, BlobsPathToSize & children) const override;
+    /// Remove file. Throws exception if file doesn't exists or it's a directory.
+    void removeObject(const std::string & path) override;
+
+    void removeObjects(const std::vector<std::string> & paths) override;
+
+    void removeObjectIfExists(const std::string & path) override;
+
+    void removeObjectsIfExist(const std::vector<std::string> & paths) override;
+
+    ObjectMetadata getObjectMetadata(const std::string & path) const override;
+
+    void copyObject( /// NOLINT
+        const std::string & object_from,
+        const std::string & object_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    void shutdown() override;
+
+    void startup() override;
+
+    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) override;
+
+    String getObjectsNamespace() const override { return ""; }
+
+    std::unique_ptr<IObjectStorage> cloneObjectStorage(const std::string & new_namespace, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) override;
+
+private:
+    const Poco::Util::AbstractConfiguration & config;
+
+    HDFSBuilderWrapper hdfs_builder;
+    HDFSFSPtr hdfs_fs;
+
+    SettingsPtr settings;
+
+
+};
+
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp b/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
new file mode 100644
index 00000000000..04862e43c65
--- /dev/null
+++ b/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
@@ -0,0 +1,54 @@
+#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Disks/DiskFactory.h>
+#include <Storages/HDFS/HDFSCommon.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+void registerDiskHDFS(DiskFactory & factory)
+{
+    auto creator = [](const String & name,
+                      const Poco::Util::AbstractConfiguration & config,
+                      const String & config_prefix,
+                      ContextPtr context_,
+                      const DisksMap & /*map*/) -> DiskPtr
+    {
+        String uri{config.getString(config_prefix + ".endpoint")};
+        checkHDFSURL(uri);
+
+        if (uri.back() != '/')
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "HDFS path must ends with '/', but '{}' doesn't.", uri);
+
+        std::unique_ptr<HDFSObjectStorageSettings> settings = std::make_unique<HDFSObjectStorageSettings>(
+            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
+            config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000),
+            context_->getSettingsRef().hdfs_replication
+        );
+        /// FIXME Cache currently unsupported :(
+        ObjectStoragePtr hdfs_storage = std::make_unique<HDFSObjectStorage>(nullptr, uri, std::move(settings), config);
+
+        auto metadata_disk = prepareForLocalMetadata(name, config, config_prefix, context_).second;
+        uint64_t copy_thread_pool_size = config.getUInt(config_prefix + ".thread_pool_size", 16);
+
+        return std::make_shared<DiskObjectStorage>(
+            name,
+            uri,
+            "DiskHDFS",
+            metadata_disk,
+            std::move(hdfs_storage),
+            DiskType::HDFS,
+            /* send_metadata = */ false,
+            copy_thread_pool_size);
+    };
+
+    factory.registerDiskType("hdfs", creator);
+}
+
+}
diff --git a/src/Disks/ObjectStorages/IObjectStorage.cpp b/src/Disks/ObjectStorages/IObjectStorage.cpp
new file mode 100644
index 00000000000..3941ad8b6f6
--- /dev/null
+++ b/src/Disks/ObjectStorages/IObjectStorage.cpp
@@ -0,0 +1,48 @@
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <IO/copyData.h>
+
+namespace DB
+{
+AsynchronousReaderPtr IObjectStorage::getThreadPoolReader()
+{
+    constexpr size_t pool_size = 50;
+    constexpr size_t queue_size = 1000000;
+    static AsynchronousReaderPtr reader = std::make_shared<ThreadPoolRemoteFSReader>(pool_size, queue_size);
+    return reader;
+}
+
+ThreadPool & IObjectStorage::getThreadPoolWriter()
+{
+    constexpr size_t pool_size = 100;
+    constexpr size_t queue_size = 1000000;
+    static ThreadPool writer(pool_size, pool_size, queue_size);
+    return writer;
+}
+
+std::string IObjectStorage::getCacheBasePath() const
+{
+    return cache ? cache->getBasePath() : "";
+}
+
+void IObjectStorage::removeFromCache(const std::string & path)
+{
+    if (cache)
+    {
+        auto key = cache->hash(path);
+        cache->remove(key);
+    }
+}
+
+void IObjectStorage::copyObjectToAnotherObjectStorage(const std::string & object_from, const std::string & object_to, IObjectStorage & object_storage_to, std::optional<ObjectAttributes> object_to_attributes) // NOLINT
+{
+    if (&object_storage_to == this)
+        copyObject(object_from, object_to, object_to_attributes);
+
+    auto in = readObject(object_from);
+    auto out = object_storage_to.writeObject(object_to, WriteMode::Rewrite);
+    copyData(*in, *out);
+    out->finalize();
+}
+
+}
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
new file mode 100644
index 00000000000..b9ac497f54f
--- /dev/null
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -0,0 +1,159 @@
+#pragma once
+
+#include <filesystem>
+#include <string>
+#include <map>
+#include <optional>
+
+#include <Poco/Timestamp.h>
+#include <Core/Defines.h>
+#include <Common/Exception.h>
+#include <IO/ReadSettings.h>
+#include <IO/WriteSettings.h>
+
+#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Common/ThreadPool.h>
+#include <Common/FileCache.h>
+#include <Disks/WriteMode.h>
+
+
+namespace DB
+{
+
+class ReadBufferFromFileBase;
+class WriteBufferFromFileBase;
+
+using ObjectAttributes = std::map<std::string, std::string>;
+
+/// Path to blob with it's size
+struct BlobPathWithSize
+{
+    std::string relative_path;
+    uint64_t bytes_size;
+
+    BlobPathWithSize() = default;
+    BlobPathWithSize(const BlobPathWithSize & other) = default;
+
+    BlobPathWithSize(const std::string & relative_path_, uint64_t bytes_size_)
+        : relative_path(relative_path_)
+        , bytes_size(bytes_size_)
+    {}
+};
+
+/// List of blobs with their sizes
+using BlobsPathToSize = std::vector<BlobPathWithSize>;
+
+struct ObjectMetadata
+{
+    uint64_t size_bytes;
+    std::optional<Poco::Timestamp> last_modified;
+    std::optional<ObjectAttributes> attributes;
+};
+
+using FinalizeCallback = std::function<void(size_t bytes_count)>;
+
+/// Base class for all object storages which implement some subset of ordinary filesystem operations.
+///
+/// Examples of object storages are S3, Azure Blob Storage, HDFS.
+class IObjectStorage
+{
+public:
+    explicit IObjectStorage(FileCachePtr && cache_)
+        : cache(std::move(cache_))
+    {}
+
+    /// Path exists or not
+    virtual bool exists(const std::string & path) const = 0;
+
+    /// List on prefix, return children with their sizes.
+    virtual void listPrefix(const std::string & path, BlobsPathToSize & children) const = 0;
+
+    /// Get object metadata if supported. It should be possible to receive
+    /// at least size of object
+    virtual ObjectMetadata getObjectMetadata(const std::string & path) const = 0;
+
+    /// Read single path from object storage
+    virtual std::unique_ptr<SeekableReadBuffer> readObject( /// NOLINT
+        const std::string & path,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const = 0;
+
+    /// Read multiple objects with common prefix
+    virtual std::unique_ptr<ReadBufferFromFileBase> readObjects( /// NOLINT
+        const std::string & common_path_prefix,
+        const BlobsPathToSize & blobs_to_read,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const = 0;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    virtual std::unique_ptr<WriteBufferFromFileBase> writeObject( /// NOLINT
+        const std::string & path,
+        WriteMode mode,
+        std::optional<ObjectAttributes> attributes = {},
+        FinalizeCallback && finalize_callback = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        const WriteSettings & write_settings = {}) = 0;
+
+    /// Remove object. Throws exception if object doesn't exists.
+    virtual void removeObject(const std::string & path) = 0;
+
+    /// Remove multiple objects. Some object storages can do batch remove in a more
+    /// optimal way.
+    virtual void removeObjects(const std::vector<std::string> & paths) = 0;
+
+    /// Remove object on path if exists
+    virtual void removeObjectIfExists(const std::string & path) = 0;
+
+    /// Remove objects on path if exists
+    virtual void removeObjectsIfExist(const std::vector<std::string> & paths) = 0;
+
+    /// Copy object with different attributes if required
+    virtual void copyObject( /// NOLINT
+        const std::string & object_from,
+        const std::string & object_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) = 0;
+
+    /// Copy object to another instance of object storage
+    /// by default just read the object from source object storage and write
+    /// to destination through buffers.
+    virtual void copyObjectToAnotherObjectStorage( /// NOLINT
+        const std::string & object_from,
+        const std::string & object_to,
+        IObjectStorage & object_storage_to,
+        std::optional<ObjectAttributes> object_to_attributes = {});
+
+    virtual ~IObjectStorage() = default;
+
+    /// Path to directory with objects cache
+    std::string getCacheBasePath() const;
+
+    static AsynchronousReaderPtr getThreadPoolReader();
+
+    static ThreadPool & getThreadPoolWriter();
+
+    virtual void shutdown() = 0;
+
+    virtual void startup() = 0;
+
+    void removeFromCache(const std::string & path);
+
+    /// Apply new settings, in most cases reiniatilize client and some other staff
+    virtual void applyNewSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) = 0;
+
+    /// Sometimes object storages have something similar to chroot or namespace, for example
+    /// buckets in S3. If object storage doesn't have any namepaces return empty string.
+    virtual String getObjectsNamespace() const = 0;
+
+    /// FIXME: confusing function required for a very specific case. Create new instance of object storage
+    /// in different namespace.
+    virtual std::unique_ptr<IObjectStorage> cloneObjectStorage(const std::string & new_namespace, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) = 0;
+
+protected:
+    FileCachePtr cache;
+};
+
+using ObjectStoragePtr = std::unique_ptr<IObjectStorage>;
+
+}
diff --git a/src/Disks/S3/ProxyConfiguration.h b/src/Disks/ObjectStorages/S3/ProxyConfiguration.h
similarity index 100%
rename from src/Disks/S3/ProxyConfiguration.h
rename to src/Disks/ObjectStorages/S3/ProxyConfiguration.h
diff --git a/src/Disks/S3/ProxyListConfiguration.cpp b/src/Disks/ObjectStorages/S3/ProxyListConfiguration.cpp
similarity index 100%
rename from src/Disks/S3/ProxyListConfiguration.cpp
rename to src/Disks/ObjectStorages/S3/ProxyListConfiguration.cpp
diff --git a/src/Disks/S3/ProxyListConfiguration.h b/src/Disks/ObjectStorages/S3/ProxyListConfiguration.h
similarity index 100%
rename from src/Disks/S3/ProxyListConfiguration.h
rename to src/Disks/ObjectStorages/S3/ProxyListConfiguration.h
diff --git a/src/Disks/S3/ProxyResolverConfiguration.cpp b/src/Disks/ObjectStorages/S3/ProxyResolverConfiguration.cpp
similarity index 100%
rename from src/Disks/S3/ProxyResolverConfiguration.cpp
rename to src/Disks/ObjectStorages/S3/ProxyResolverConfiguration.cpp
diff --git a/src/Disks/S3/ProxyResolverConfiguration.h b/src/Disks/ObjectStorages/S3/ProxyResolverConfiguration.h
similarity index 100%
rename from src/Disks/S3/ProxyResolverConfiguration.h
rename to src/Disks/ObjectStorages/S3/ProxyResolverConfiguration.h
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
new file mode 100644
index 00000000000..78c0fa0ae3c
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -0,0 +1,502 @@
+#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
+
+#if USE_AWS_S3
+
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <IO/WriteBufferFromS3.h>
+#include <IO/ReadBufferFromS3.h>
+#include <IO/SeekAvoidingReadBuffer.h>
+#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Disks/ObjectStorages/S3/diskSettings.h>
+
+#include <aws/s3/model/CopyObjectRequest.h>
+#include <aws/s3/model/ListObjectsV2Request.h>
+#include <aws/s3/model/HeadObjectRequest.h>
+#include <aws/s3/model/DeleteObjectsRequest.h>
+#include <aws/s3/model/CreateMultipartUploadRequest.h>
+#include <aws/s3/model/CompleteMultipartUploadRequest.h>
+#include <aws/s3/model/UploadPartCopyRequest.h>
+#include <aws/s3/model/AbortMultipartUploadRequest.h>
+
+#include <Common/FileCache.h>
+#include <Common/FileCacheFactory.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int S3_ERROR;
+    extern const int BAD_ARGUMENTS;
+}
+
+namespace
+{
+
+template <typename Result, typename Error>
+void throwIfError(Aws::Utils::Outcome<Result, Error> & response)
+{
+    if (!response.IsSuccess())
+    {
+        const auto & err = response.GetError();
+        throw Exception(std::to_string(static_cast<int>(err.GetErrorType())) + ": " + err.GetMessage(), ErrorCodes::S3_ERROR);
+    }
+}
+
+template <typename Result, typename Error>
+void throwIfError(const Aws::Utils::Outcome<Result, Error> & response)
+{
+    if (!response.IsSuccess())
+    {
+        const auto & err = response.GetError();
+        throw Exception(err.GetMessage(), static_cast<int>(err.GetErrorType()));
+    }
+}
+
+template <typename Result, typename Error>
+void logIfError(const Aws::Utils::Outcome<Result, Error> & response, std::function<String()> && msg)
+{
+    try
+    {
+        throwIfError(response);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__, msg());
+    }
+}
+
+}
+
+Aws::S3::Model::HeadObjectOutcome S3ObjectStorage::requestObjectHeadData(const std::string & bucket_from, const std::string & key) const
+{
+    auto client_ptr = client.get();
+    Aws::S3::Model::HeadObjectRequest request;
+    request.SetBucket(bucket_from);
+    request.SetKey(key);
+
+    return client_ptr->HeadObject(request);
+}
+
+bool S3ObjectStorage::exists(const std::string & path) const
+{
+    auto object_head = requestObjectHeadData(bucket, path);
+    if (!object_head.IsSuccess())
+    {
+        if (object_head.GetError().GetErrorType() == Aws::S3::S3Errors::RESOURCE_NOT_FOUND)
+            return false;
+
+        throwIfError(object_head);
+    }
+    return true;
+}
+
+
+std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
+    const std::string & common_path_prefix,
+    const BlobsPathToSize & blobs_to_read,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+
+    ReadSettings disk_read_settings{read_settings};
+    if (cache)
+    {
+        if (IFileCache::isReadOnly())
+            disk_read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
+
+        disk_read_settings.remote_fs_cache = cache;
+    }
+
+    auto settings_ptr = s3_settings.get();
+
+    auto s3_impl = std::make_unique<ReadBufferFromS3Gather>(
+        client.get(), bucket, version_id, common_path_prefix, blobs_to_read,
+        settings_ptr->s3_settings.max_single_read_retries, disk_read_settings);
+
+    if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
+    {
+        auto reader = getThreadPoolReader();
+        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, disk_read_settings, std::move(s3_impl));
+    }
+    else
+    {
+        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(s3_impl));
+        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings_ptr->min_bytes_for_seek);
+    }
+}
+
+std::unique_ptr<SeekableReadBuffer> S3ObjectStorage::readObject( /// NOLINT
+    const std::string & path,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+    auto settings_ptr = s3_settings.get();
+    ReadSettings disk_read_settings{read_settings};
+    if (cache)
+    {
+        if (IFileCache::isReadOnly())
+            disk_read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
+
+        disk_read_settings.remote_fs_cache = cache;
+    }
+
+    return std::make_unique<ReadBufferFromS3>(client.get(), bucket, path, version_id, settings_ptr->s3_settings.max_single_read_retries, disk_read_settings);
+}
+
+
+std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLINT
+    const std::string & path,
+    WriteMode mode, // S3 doesn't support append, only rewrite
+    std::optional<ObjectAttributes> attributes,
+    FinalizeCallback && finalize_callback,
+    size_t buf_size,
+    const WriteSettings & write_settings)
+{
+    if (mode != WriteMode::Rewrite)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 doesn't support append to files");
+
+    bool cache_on_write = cache
+        && fs::path(path).extension() != ".tmp"
+        && write_settings.enable_filesystem_cache_on_write_operations
+        && FileCacheFactory::instance().getSettings(getCacheBasePath()).cache_on_write_operations;
+
+    auto settings_ptr = s3_settings.get();
+    auto s3_buffer = std::make_unique<WriteBufferFromS3>(
+        client.get(),
+        bucket,
+        path,
+        settings_ptr->s3_settings,
+        attributes,
+        buf_size, threadPoolCallbackRunner(getThreadPoolWriter()),
+        cache_on_write ? cache : nullptr);
+
+    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(s3_buffer), std::move(finalize_callback), path);
+}
+
+void S3ObjectStorage::listPrefix(const std::string & path, BlobsPathToSize & children) const
+{
+    auto settings_ptr = s3_settings.get();
+    auto client_ptr = client.get();
+
+    Aws::S3::Model::ListObjectsV2Request request;
+    request.SetBucket(bucket);
+    request.SetPrefix(path);
+    request.SetMaxKeys(settings_ptr->list_object_keys_size);
+
+    Aws::S3::Model::ListObjectsV2Outcome outcome;
+    do
+    {
+        outcome = client_ptr->ListObjectsV2(request);
+        throwIfError(outcome);
+
+        auto result = outcome.GetResult();
+        auto objects = result.GetContents();
+
+        if (objects.empty())
+            break;
+
+        for (const auto & object : objects)
+            children.emplace_back(object.GetKey(), object.GetSize());
+
+        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
+    } while (outcome.GetResult().GetIsTruncated());
+}
+
+void S3ObjectStorage::removeObject(const std::string & path)
+{
+    auto client_ptr = client.get();
+    Aws::S3::Model::ObjectIdentifier obj;
+    obj.SetKey(path);
+
+    Aws::S3::Model::Delete delkeys;
+    delkeys.SetObjects({obj});
+
+    Aws::S3::Model::DeleteObjectsRequest request;
+    request.SetBucket(bucket);
+    request.SetDelete(delkeys);
+    auto outcome = client_ptr->DeleteObjects(request);
+
+    throwIfError(outcome);
+}
+
+void S3ObjectStorage::removeObjects(const std::vector<std::string> & paths)
+{
+    if (paths.empty())
+        return;
+
+    auto client_ptr = client.get();
+    auto settings_ptr = s3_settings.get();
+
+    size_t chunk_size_limit = settings_ptr->objects_chunk_size_to_delete;
+    size_t current_position = 0;
+
+    while (current_position < paths.size())
+    {
+        std::vector<Aws::S3::Model::ObjectIdentifier> current_chunk;
+        String keys;
+        for (; current_position < paths.size() && current_chunk.size() < chunk_size_limit; ++current_position)
+        {
+            Aws::S3::Model::ObjectIdentifier obj;
+            obj.SetKey(paths[current_position]);
+            current_chunk.push_back(obj);
+
+            if (!keys.empty())
+                keys += ", ";
+            keys += paths[current_position];
+        }
+
+        Aws::S3::Model::Delete delkeys;
+        delkeys.SetObjects(current_chunk);
+        Aws::S3::Model::DeleteObjectsRequest request;
+        request.SetBucket(bucket);
+        request.SetDelete(delkeys);
+        auto outcome = client_ptr->DeleteObjects(request);
+        throwIfError(outcome);
+    }
+}
+
+void S3ObjectStorage::removeObjectIfExists(const std::string & path)
+{
+    auto client_ptr = client.get();
+    Aws::S3::Model::ObjectIdentifier obj;
+    obj.SetKey(path);
+
+    Aws::S3::Model::Delete delkeys;
+    delkeys.SetObjects({obj});
+
+    Aws::S3::Model::DeleteObjectsRequest request;
+    request.SetBucket(bucket);
+    request.SetDelete(delkeys);
+    auto outcome = client_ptr->DeleteObjects(request);
+    if (!outcome.IsSuccess() && outcome.GetError().GetErrorType() != Aws::S3::S3Errors::RESOURCE_NOT_FOUND)
+        throwIfError(outcome);
+}
+
+void S3ObjectStorage::removeObjectsIfExist(const std::vector<std::string> & paths)
+{
+    if (paths.empty())
+        return;
+
+    auto client_ptr = client.get();
+    auto settings_ptr = s3_settings.get();
+
+
+    size_t chunk_size_limit = settings_ptr->objects_chunk_size_to_delete;
+    size_t current_position = 0;
+
+    while (current_position < paths.size())
+    {
+        std::vector<Aws::S3::Model::ObjectIdentifier> current_chunk;
+        String keys;
+        for (; current_position < paths.size() && current_chunk.size() < chunk_size_limit; ++current_position)
+        {
+            Aws::S3::Model::ObjectIdentifier obj;
+            obj.SetKey(paths[current_position]);
+            current_chunk.push_back(obj);
+
+            if (!keys.empty())
+                keys += ", ";
+            keys += paths[current_position];
+        }
+
+        Aws::S3::Model::Delete delkeys;
+        delkeys.SetObjects(current_chunk);
+        Aws::S3::Model::DeleteObjectsRequest request;
+        request.SetBucket(bucket);
+        request.SetDelete(delkeys);
+        auto outcome = client_ptr->DeleteObjects(request);
+        if (!outcome.IsSuccess() && outcome.GetError().GetErrorType() != Aws::S3::S3Errors::RESOURCE_NOT_FOUND)
+            throwIfError(outcome);
+    }
+}
+
+ObjectMetadata S3ObjectStorage::getObjectMetadata(const std::string & path) const
+{
+    ObjectMetadata result;
+
+    auto object_head = requestObjectHeadData(bucket, path);
+    throwIfError(object_head);
+
+    auto & object_head_result = object_head.GetResult();
+    result.size_bytes = object_head_result.GetContentLength();
+    result.last_modified = object_head_result.GetLastModified().Millis();
+    result.attributes = object_head_result.GetMetadata();
+
+    return result;
+}
+
+void S3ObjectStorage::copyObjectToAnotherObjectStorage(const std::string & object_from, const std::string & object_to, IObjectStorage & object_storage_to, std::optional<ObjectAttributes> object_to_attributes) // NOLINT
+{
+    /// Shortcut for S3
+    if (auto * dest_s3 = dynamic_cast<S3ObjectStorage * >(&object_storage_to); dest_s3 != nullptr)
+        copyObjectImpl(bucket, object_from, dest_s3->bucket, object_to, {}, object_to_attributes);
+    else
+        IObjectStorage::copyObjectToAnotherObjectStorage(object_from, object_to, object_storage_to, object_to_attributes);
+}
+
+void S3ObjectStorage::copyObjectImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
+    std::optional<Aws::S3::Model::HeadObjectResult> head,
+    std::optional<ObjectAttributes> metadata) const
+{
+    auto client_ptr = client.get();
+    Aws::S3::Model::CopyObjectRequest request;
+    request.SetCopySource(src_bucket + "/" + src_key);
+    request.SetBucket(dst_bucket);
+    request.SetKey(dst_key);
+    if (metadata)
+    {
+        request.SetMetadata(*metadata);
+        request.SetMetadataDirective(Aws::S3::Model::MetadataDirective::REPLACE);
+    }
+
+    auto outcome = client_ptr->CopyObject(request);
+
+    if (!outcome.IsSuccess() && outcome.GetError().GetExceptionName() == "EntityTooLarge")
+    { // Can't come here with MinIO, MinIO allows single part upload for large objects.
+        copyObjectMultipartImpl(src_bucket, src_key, dst_bucket, dst_key, head, metadata);
+        return;
+    }
+
+    throwIfError(outcome);
+}
+
+void S3ObjectStorage::copyObjectMultipartImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
+    std::optional<Aws::S3::Model::HeadObjectResult> head,
+    std::optional<ObjectAttributes> metadata) const
+{
+    if (!head)
+        head = requestObjectHeadData(src_bucket, src_key).GetResult();
+
+    auto settings_ptr = s3_settings.get();
+    auto client_ptr = client.get();
+    size_t size = head->GetContentLength();
+
+    String multipart_upload_id;
+
+    {
+        Aws::S3::Model::CreateMultipartUploadRequest request;
+        request.SetBucket(dst_bucket);
+        request.SetKey(dst_key);
+        if (metadata)
+            request.SetMetadata(*metadata);
+
+        auto outcome = client_ptr->CreateMultipartUpload(request);
+
+        throwIfError(outcome);
+
+        multipart_upload_id = outcome.GetResult().GetUploadId();
+    }
+
+    std::vector<String> part_tags;
+
+    size_t upload_part_size = settings_ptr->s3_settings.min_upload_part_size;
+    for (size_t position = 0, part_number = 1; position < size; ++part_number, position += upload_part_size)
+    {
+        Aws::S3::Model::UploadPartCopyRequest part_request;
+        part_request.SetCopySource(src_bucket + "/" + src_key);
+        part_request.SetBucket(dst_bucket);
+        part_request.SetKey(dst_key);
+        part_request.SetUploadId(multipart_upload_id);
+        part_request.SetPartNumber(part_number);
+        part_request.SetCopySourceRange(fmt::format("bytes={}-{}", position, std::min(size, position + upload_part_size) - 1));
+
+        auto outcome = client_ptr->UploadPartCopy(part_request);
+        if (!outcome.IsSuccess())
+        {
+            Aws::S3::Model::AbortMultipartUploadRequest abort_request;
+            abort_request.SetBucket(dst_bucket);
+            abort_request.SetKey(dst_key);
+            abort_request.SetUploadId(multipart_upload_id);
+            client_ptr->AbortMultipartUpload(abort_request);
+            // In error case we throw exception later with first error from UploadPartCopy
+        }
+        throwIfError(outcome);
+
+        auto etag = outcome.GetResult().GetCopyPartResult().GetETag();
+        part_tags.push_back(etag);
+    }
+
+    {
+        Aws::S3::Model::CompleteMultipartUploadRequest req;
+        req.SetBucket(dst_bucket);
+        req.SetKey(dst_key);
+        req.SetUploadId(multipart_upload_id);
+
+        Aws::S3::Model::CompletedMultipartUpload multipart_upload;
+        for (size_t i = 0; i < part_tags.size(); ++i)
+        {
+            Aws::S3::Model::CompletedPart part;
+            multipart_upload.AddParts(part.WithETag(part_tags[i]).WithPartNumber(i + 1));
+        }
+
+        req.SetMultipartUpload(multipart_upload);
+
+        auto outcome = client_ptr->CompleteMultipartUpload(req);
+
+        throwIfError(outcome);
+    }
+}
+
+void S3ObjectStorage::copyObject(const std::string & object_from, const std::string & object_to, std::optional<ObjectAttributes> object_to_attributes) // NOLINT
+{
+    auto head = requestObjectHeadData(bucket, object_from).GetResult();
+    if (head.GetContentLength() >= static_cast<int64_t>(5UL * 1024 * 1024 * 1024))
+        copyObjectMultipartImpl(bucket, object_from, bucket, object_to, head, object_to_attributes);
+    else
+        copyObjectImpl(bucket, object_from, bucket, object_to, head, object_to_attributes);
+}
+
+void S3ObjectStorage::setNewSettings(std::unique_ptr<S3ObjectStorageSettings> && s3_settings_)
+{
+    s3_settings.set(std::move(s3_settings_));
+}
+
+void S3ObjectStorage::setNewClient(std::unique_ptr<Aws::S3::S3Client> && client_)
+{
+    client.set(std::move(client_));
+}
+
+void S3ObjectStorage::shutdown()
+{
+    auto client_ptr = client.get();
+    /// This call stops any next retry attempts for ongoing S3 requests.
+    /// If S3 request is failed and the method below is executed S3 client immediately returns the last failed S3 request outcome.
+    /// If S3 is healthy nothing wrong will be happened and S3 requests will be processed in a regular way without errors.
+    /// This should significantly speed up shutdown process if S3 is unhealthy.
+    const_cast<Aws::S3::S3Client &>(*client_ptr).DisableRequestProcessing();
+}
+
+void S3ObjectStorage::startup()
+{
+    auto client_ptr = client.get();
+
+    /// Need to be enabled if it was disabled during shutdown() call.
+    const_cast<Aws::S3::S3Client &>(*client_ptr).EnableRequestProcessing();
+}
+
+void S3ObjectStorage::applyNewSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    s3_settings.set(getSettings(config, config_prefix, context));
+    client.set(getClient(config, config_prefix, context));
+}
+
+std::unique_ptr<IObjectStorage> S3ObjectStorage::cloneObjectStorage(const std::string & new_namespace, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    return std::make_unique<S3ObjectStorage>(
+        nullptr, getClient(config, config_prefix, context),
+        getSettings(config, config_prefix, context),
+        version_id, new_namespace);
+}
+
+}
+
+
+#endif
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
new file mode 100644
index 00000000000..9c6c7664ffb
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -0,0 +1,138 @@
+#pragma once
+
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <memory>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/model/HeadObjectResult.h>
+#include <aws/s3/model/ListObjectsV2Result.h>
+#include <Storages/StorageS3Settings.h>
+
+
+namespace DB
+{
+
+struct S3ObjectStorageSettings
+{
+    S3ObjectStorageSettings() = default;
+
+    S3ObjectStorageSettings(
+        const S3Settings::ReadWriteSettings & s3_settings_,
+        uint64_t min_bytes_for_seek_,
+        int32_t list_object_keys_size_,
+        int32_t objects_chunk_size_to_delete_)
+        : s3_settings(s3_settings_)
+        , min_bytes_for_seek(min_bytes_for_seek_)
+        , list_object_keys_size(list_object_keys_size_)
+        , objects_chunk_size_to_delete(objects_chunk_size_to_delete_)
+    {}
+
+    S3Settings::ReadWriteSettings s3_settings;
+
+    uint64_t min_bytes_for_seek;
+    int32_t list_object_keys_size;
+    int32_t objects_chunk_size_to_delete;
+};
+
+
+class S3ObjectStorage : public IObjectStorage
+{
+public:
+    S3ObjectStorage(
+        FileCachePtr && cache_,
+        std::unique_ptr<Aws::S3::S3Client> && client_,
+        std::unique_ptr<S3ObjectStorageSettings> && s3_settings_,
+        String version_id_,
+        String bucket_)
+        : IObjectStorage(std::move(cache_))
+        , bucket(bucket_)
+        , client(std::move(client_))
+        , s3_settings(std::move(s3_settings_))
+        , version_id(std::move(version_id_))
+    {}
+
+    bool exists(const std::string & path) const override;
+
+    std::unique_ptr<SeekableReadBuffer> readObject( /// NOLINT
+        const std::string & path,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObjects( /// NOLINT
+        const std::string & common_path_prefix,
+        const BlobsPathToSize & blobs_to_read,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    std::unique_ptr<WriteBufferFromFileBase> writeObject( /// NOLINT
+        const std::string & path,
+        WriteMode mode,
+        std::optional<ObjectAttributes> attributes = {},
+        FinalizeCallback && finalize_callback = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        const WriteSettings & write_settings = {}) override;
+
+    void listPrefix(const std::string & path, BlobsPathToSize & children) const override;
+    /// Remove file. Throws exception if file doesn't exist or it's a directory.
+    void removeObject(const std::string & path) override;
+
+    void removeObjects(const std::vector<std::string> & paths) override;
+
+    void removeObjectIfExists(const std::string & path) override;
+
+    void removeObjectsIfExist(const std::vector<std::string> & paths) override;
+
+    ObjectMetadata getObjectMetadata(const std::string & path) const override;
+
+    void copyObject( /// NOLINT
+        const std::string & object_from,
+        const std::string & object_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    void copyObjectToAnotherObjectStorage( /// NOLINT
+        const std::string & object_from,
+        const std::string & object_to,
+        IObjectStorage & object_storage_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    void shutdown() override;
+
+    void startup() override;
+
+    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) override;
+
+    String getObjectsNamespace() const override { return bucket; }
+
+    std::unique_ptr<IObjectStorage> cloneObjectStorage(const std::string & new_namespace, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context) override;
+private:
+    void setNewSettings(std::unique_ptr<S3ObjectStorageSettings> && s3_settings_);
+
+    void setNewClient(std::unique_ptr<Aws::S3::S3Client> && client_);
+
+    void copyObjectImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
+        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt,
+        std::optional<ObjectAttributes> metadata = std::nullopt) const;
+
+    void copyObjectMultipartImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
+        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt,
+        std::optional<ObjectAttributes> metadata = std::nullopt) const;
+
+    Aws::S3::Model::HeadObjectOutcome requestObjectHeadData(const std::string & bucket_from, const std::string & key) const;
+
+    std::string bucket;
+
+    MultiVersion<Aws::S3::S3Client> client;
+    MultiVersion<S3ObjectStorageSettings> s3_settings;
+
+    const String version_id;
+};
+
+}
+
+#endif
diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/ObjectStorages/S3/diskSettings.cpp
similarity index 63%
rename from src/Disks/S3/registerDiskS3.cpp
rename to src/Disks/ObjectStorages/S3/diskSettings.cpp
index b145f805a23..79a7978c53e 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -1,53 +1,50 @@
-#include <Common/config.h>
+#include <Disks/ObjectStorages/S3/diskSettings.h>
 
+#if USE_AWS_S3
+
+#include <Common/StringUtils/StringUtils.h>
 #include <Common/logger_useful.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include "Disks/DiskFactory.h"
 
-#if USE_AWS_S3
-
 #include <aws/core/client/DefaultRetryStrategy.h>
+#include <base/getFQDNOrHostName.h>
 #include <IO/S3Common.h>
-#include "DiskS3.h"
-#include "Disks/DiskCacheWrapper.h"
-#include "Storages/StorageS3Settings.h"
-#include "ProxyConfiguration.h"
-#include "ProxyListConfiguration.h"
-#include "ProxyResolverConfiguration.h"
-#include "Disks/DiskRestartProxy.h"
-#include "Disks/DiskLocal.h"
-#include "Disks/RemoteDisksCommon.h"
+#include <Disks/DiskCacheWrapper.h>
+#include <Storages/StorageS3Settings.h>
+#include <Disks/ObjectStorages/S3/ProxyConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyListConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyResolverConfiguration.h>
+#include <Disks/DiskRestartProxy.h>
+#include <Disks/DiskLocal.h>
 #include <Common/FileCacheFactory.h>
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
-    extern const int PATH_ACCESS_DENIED;
 }
 
-namespace
+std::unique_ptr<S3ObjectStorageSettings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
 {
-void checkWriteAccess(IDisk & disk)
-{
-    auto file = disk.writeFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
-    file->write("test", 4);
-}
+    S3Settings::ReadWriteSettings rw_settings;
+    rw_settings.max_single_read_retries = config.getUInt64(config_prefix + ".s3_max_single_read_retries", context->getSettingsRef().s3_max_single_read_retries);
+    rw_settings.min_upload_part_size = config.getUInt64(config_prefix + ".s3_min_upload_part_size", context->getSettingsRef().s3_min_upload_part_size);
+    rw_settings.upload_part_size_multiply_factor = config.getUInt64(config_prefix + ".s3_upload_part_size_multiply_factor", context->getSettingsRef().s3_upload_part_size_multiply_factor);
+    rw_settings.upload_part_size_multiply_parts_count_threshold = config.getUInt64(config_prefix + ".s3_upload_part_size_multiply_parts_count_threshold", context->getSettingsRef().s3_upload_part_size_multiply_parts_count_threshold);
+    rw_settings.max_single_part_upload_size = config.getUInt64(config_prefix + ".s3_max_single_part_upload_size", context->getSettingsRef().s3_max_single_part_upload_size);
 
-void checkReadAccess(const String & disk_name, IDisk & disk)
-{
-    auto file = disk.readFile("test_acl");
-    String buf(4, '0');
-    file->readStrict(buf.data(), 4);
-    if (buf != "test")
-        throw Exception("No read access to S3 bucket in disk " + disk_name, ErrorCodes::PATH_ACCESS_DENIED);
+    return std::make_unique<S3ObjectStorageSettings>(
+        rw_settings,
+        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
+        config.getInt(config_prefix + ".list_object_keys_size", 1000),
+        config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000));
 }
 
-void checkRemoveAccess(IDisk & disk) { disk.removeFile("test_acl"); }
-
 std::shared_ptr<S3::ProxyResolverConfiguration> getProxyResolverConfiguration(
     const String & prefix, const Poco::Util::AbstractConfiguration & proxy_resolver_config)
 {
@@ -111,12 +108,13 @@ std::shared_ptr<S3::ProxyConfiguration> getProxyConfiguration(const String & pre
     return getProxyListConfiguration(prefix + ".proxy", config);
 }
 
-std::shared_ptr<Aws::S3::S3Client>
-getClient(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
+
+std::unique_ptr<Aws::S3::S3Client> getClient(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
 {
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
         config.getString(config_prefix + ".region", ""),
-        context->getRemoteHostFilter(), context->getGlobalContext()->getSettingsRef().s3_max_redirects);
+        context->getRemoteHostFilter(), context->getGlobalContext()->getSettingsRef().s3_max_redirects,
+        context->getGlobalContext()->getSettingsRef().enable_s3_requests_logging);
 
     S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
     if (uri.key.back() != '/')
@@ -150,92 +148,6 @@ getClient(const Poco::Util::AbstractConfiguration & config, const String & confi
         config.getBool(config_prefix + ".use_insecure_imds_request", config.getBool("s3.use_insecure_imds_request", false)));
 }
 
-std::unique_ptr<DiskS3Settings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
-{
-    S3Settings::ReadWriteSettings rw_settings;
-    rw_settings.max_single_read_retries = config.getUInt64(config_prefix + ".s3_max_single_read_retries", context->getSettingsRef().s3_max_single_read_retries);
-    rw_settings.min_upload_part_size = config.getUInt64(config_prefix + ".s3_min_upload_part_size", context->getSettingsRef().s3_min_upload_part_size);
-    rw_settings.upload_part_size_multiply_factor = config.getUInt64(config_prefix + ".s3_upload_part_size_multiply_factor", context->getSettingsRef().s3_upload_part_size_multiply_factor);
-    rw_settings.upload_part_size_multiply_parts_count_threshold = config.getUInt64(config_prefix + ".s3_upload_part_size_multiply_parts_count_threshold", context->getSettingsRef().s3_upload_part_size_multiply_parts_count_threshold);
-    rw_settings.max_single_part_upload_size = config.getUInt64(config_prefix + ".s3_max_single_part_upload_size", context->getSettingsRef().s3_max_single_part_upload_size);
-
-    return std::make_unique<DiskS3Settings>(
-        getClient(config, config_prefix, context),
-        rw_settings,
-        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-        config.getBool(config_prefix + ".send_metadata", false),
-        config.getInt(config_prefix + ".thread_pool_size", 16),
-        config.getInt(config_prefix + ".list_object_keys_size", 1000),
-        config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000));
 }
 
-}
-
-
-void registerDiskS3(DiskFactory & factory)
-{
-    auto creator = [](const String & name,
-                      const Poco::Util::AbstractConfiguration & config,
-                      const String & config_prefix,
-                      ContextPtr context,
-                      const DisksMap & /*map*/) -> DiskPtr {
-        S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
-
-        if (uri.key.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No key in S3 uri: {}", uri.uri.toString());
-
-        if (uri.key.back() != '/')
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 path must ends with '/', but '{}' doesn't.", uri.key);
-
-        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
-
-        FileCachePtr cache = getCachePtrForDisk(name, config, config_prefix, context);
-
-        std::shared_ptr<IDisk> s3disk = std::make_shared<DiskS3>(
-            name,
-            uri.bucket,
-            uri.key,
-            uri.version_id,
-            metadata_disk,
-            std::move(cache),
-            context,
-            getSettings(config, config_prefix, context),
-            getSettings);
-
-        /// This code is used only to check access to the corresponding disk.
-        if (!config.getBool(config_prefix + ".skip_access_check", false))
-        {
-            checkWriteAccess(*s3disk);
-            checkReadAccess(name, *s3disk);
-            checkRemoveAccess(*s3disk);
-        }
-
-        s3disk->startup();
-
-
-#ifdef NDEBUG
-        bool use_cache = true;
-#else
-        /// Current S3 cache implementation lead to allocations in destructor of
-        /// read buffer.
-        bool use_cache = false;
-#endif
-
-        if (config.getBool(config_prefix + ".cache_enabled", use_cache))
-        {
-            String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
-            s3disk = wrapWithCache(s3disk, "s3-cache", cache_path, metadata_path);
-        }
-
-        return std::make_shared<DiskRestartProxy>(s3disk);
-    };
-    factory.registerDiskType("s3", creator);
-}
-
-}
-
-#else
-
-void registerDiskS3(DiskFactory &) {}
-
 #endif
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.h b/src/Disks/ObjectStorages/S3/diskSettings.h
new file mode 100644
index 00000000000..b06e412b6e9
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/diskSettings.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
+#include <aws/core/client/DefaultRetryStrategy.h>
+#include <IO/S3Common.h>
+#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
+#include <Disks/DiskCacheWrapper.h>
+#include <Storages/StorageS3Settings.h>
+#include <Disks/ObjectStorages/S3/ProxyConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyListConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyResolverConfiguration.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/DiskRestartProxy.h>
+#include <Disks/DiskLocal.h>
+#include <Common/FileCacheFactory.h>
+
+namespace DB
+{
+
+std::unique_ptr<S3ObjectStorageSettings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context);
+
+std::unique_ptr<Aws::S3::S3Client> getClient(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context);
+
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/S3/parseConfig.h b/src/Disks/ObjectStorages/S3/parseConfig.h
new file mode 100644
index 00000000000..725c86ce462
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/parseConfig.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
+#include <aws/core/client/DefaultRetryStrategy.h>
+#include <IO/S3Common.h>
+#include <Disks/DiskCacheWrapper.h>
+#include <Storages/StorageS3Settings.h>
+#include <Disks/ObjectStorages/S3/ProxyConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyListConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyResolverConfiguration.h>
+#include <Disks/DiskRestartProxy.h>
+#include <Disks/DiskLocal.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Common/FileCacheFactory.h>
+
+
+namespace DB
+{
+
+
+std::unique_ptr<DiskS3Settings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context);
+
+std::shared_ptr<Aws::S3::S3Client> getClient(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context);
+
+
+}
diff --git a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
new file mode 100644
index 00000000000..d7e82ef3392
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
@@ -0,0 +1,145 @@
+#include <Common/config.h>
+
+#include <Common/logger_useful.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/Context.h>
+#include <Disks/DiskFactory.h>
+
+#if USE_AWS_S3
+
+#include <aws/core/client/DefaultRetryStrategy.h>
+
+#include <base/getFQDNOrHostName.h>
+#include <Common/FileCacheFactory.h>
+
+#include <Disks/DiskCacheWrapper.h>
+#include <Disks/DiskRestartProxy.h>
+#include <Disks/DiskLocal.h>
+
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <Disks/ObjectStorages/S3/ProxyConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyListConfiguration.h>
+#include <Disks/ObjectStorages/S3/ProxyResolverConfiguration.h>
+#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
+#include <Disks/ObjectStorages/S3/diskSettings.h>
+
+#include <IO/S3Common.h>
+
+#include <Storages/StorageS3Settings.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int PATH_ACCESS_DENIED;
+}
+
+namespace
+{
+
+void checkWriteAccess(IDisk & disk)
+{
+    auto file = disk.writeFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+    try
+    {
+        file->write("test", 4);
+    }
+    catch (...)
+    {
+        file->finalize();
+        throw;
+    }
+}
+
+void checkReadAccess(const String & disk_name, IDisk & disk)
+{
+    auto file = disk.readFile("test_acl");
+    String buf(4, '0');
+    file->readStrict(buf.data(), 4);
+    if (buf != "test")
+        throw Exception("No read access to S3 bucket in disk " + disk_name, ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+void checkRemoveAccess(IDisk & disk) { disk.removeFile("test_acl"); }
+
+}
+
+void registerDiskS3(DiskFactory & factory)
+{
+    auto creator = [](const String & name,
+                      const Poco::Util::AbstractConfiguration & config,
+                      const String & config_prefix,
+                      ContextPtr context,
+                      const DisksMap & /*map*/) -> DiskPtr {
+        S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
+
+        if (uri.key.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No key in S3 uri: {}", uri.uri.toString());
+
+        if (uri.key.back() != '/')
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 path must ends with '/', but '{}' doesn't.", uri.key);
+
+        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
+
+        FileCachePtr cache = getCachePtrForDisk(name, config, config_prefix, context);
+
+        ObjectStoragePtr s3_storage = std::make_unique<S3ObjectStorage>(
+            std::move(cache), getClient(config, config_prefix, context),
+            getSettings(config, config_prefix, context),
+            uri.version_id, uri.bucket);
+
+        bool send_metadata = config.getBool(config_prefix + ".send_metadata", false);
+        uint64_t copy_thread_pool_size = config.getUInt(config_prefix + ".thread_pool_size", 16);
+
+        std::shared_ptr<DiskObjectStorage> s3disk = std::make_shared<DiskObjectStorage>(
+            name,
+            uri.key,
+            "DiskS3",
+            metadata_disk,
+            std::move(s3_storage),
+            DiskType::S3,
+            send_metadata,
+            copy_thread_pool_size);
+
+        /// This code is used only to check access to the corresponding disk.
+        if (!config.getBool(config_prefix + ".skip_access_check", false))
+        {
+            checkWriteAccess(*s3disk);
+            checkReadAccess(name, *s3disk);
+            checkRemoveAccess(*s3disk);
+        }
+
+        s3disk->startup(context);
+
+        std::shared_ptr<IDisk> disk_result = s3disk;
+
+#ifdef NDEBUG
+        bool use_cache = true;
+#else
+        /// Current S3 cache implementation lead to allocations in destructor of
+        /// read buffer.
+        bool use_cache = false;
+#endif
+
+        if (config.getBool(config_prefix + ".cache_enabled", use_cache))
+        {
+            String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
+            disk_result = wrapWithCache(disk_result, "s3-cache", cache_path, metadata_path);
+        }
+
+        return std::make_shared<DiskRestartProxy>(disk_result);
+    };
+    factory.registerDiskType("s3", creator);
+}
+
+}
+
+#else
+
+void registerDiskS3(DiskFactory &) {}
+
+#endif
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
deleted file mode 100644
index 5e3d7031350..00000000000
--- a/src/Disks/S3/DiskS3.cpp
+++ /dev/null
@@ -1,1055 +0,0 @@
-#include "DiskS3.h"
-
-#if USE_AWS_S3
-#include "Disks/DiskFactory.h"
-
-#include <bitset>
-#include <random>
-#include <utility>
-
-#include <boost/algorithm/string.hpp>
-
-#include <Common/scope_guard_safe.h>
-#include <base/unit.h>
-#include <base/FnTraits.h>
-
-#include <Common/checkStackSize.h>
-#include <Common/createHardLink.h>
-#include <Common/quoteString.h>
-#include <Common/thread_local_rng.h>
-#include <Common/getRandomASCIIString.h>
-#include <Common/FileCacheFactory.h>
-#include <Common/FileCache.h>
-
-#include <Interpreters/Context.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
-#include <IO/ReadBufferFromS3.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/ReadHelpers.h>
-#include <IO/SeekAvoidingReadBuffer.h>
-#include <IO/WriteBufferFromS3.h>
-#include <IO/WriteHelpers.h>
-
-#include <Disks/RemoteDisksCommon.h>
-#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
-
-#include <aws/s3/model/CopyObjectRequest.h>
-#include <aws/s3/model/DeleteObjectsRequest.h>
-#include <aws/s3/model/GetObjectRequest.h>
-#include <aws/s3/model/ListObjectsV2Request.h>
-#include <aws/s3/model/HeadObjectRequest.h>
-#include <aws/s3/model/CreateMultipartUploadRequest.h>
-#include <aws/s3/model/CompleteMultipartUploadRequest.h>
-#include <aws/s3/model/UploadPartCopyRequest.h>
-#include <aws/s3/model/AbortMultipartUploadRequest.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int S3_ERROR;
-    extern const int FILE_ALREADY_EXISTS;
-    extern const int UNKNOWN_FORMAT;
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
-}
-
-template <typename Result, typename Error>
-void throwIfError(Aws::Utils::Outcome<Result, Error> & response)
-{
-    if (!response.IsSuccess())
-    {
-        const auto & err = response.GetError();
-        throw Exception(std::to_string(static_cast<int>(err.GetErrorType())) + ": " + err.GetMessage(), ErrorCodes::S3_ERROR);
-    }
-}
-
-template <typename Result, typename Error>
-void throwIfError(const Aws::Utils::Outcome<Result, Error> & response)
-{
-    if (!response.IsSuccess())
-    {
-        const auto & err = response.GetError();
-        throw Exception(err.GetMessage(), static_cast<int>(err.GetErrorType()));
-    }
-}
-template <typename Result, typename Error>
-void logIfError(Aws::Utils::Outcome<Result, Error> & response, Fn<String()> auto && msg)
-{
-    try
-    {
-        throwIfError(response);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__, msg());
-    }
-}
-
-template <typename Result, typename Error>
-void logIfError(const Aws::Utils::Outcome<Result, Error> & response, Fn<String()> auto && msg)
-{
-    try
-    {
-        throwIfError(response);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__, msg());
-    }
-}
-
-DiskS3::DiskS3(
-    String name_,
-    String bucket_,
-    String s3_root_path_,
-    String version_id_,
-    DiskPtr metadata_disk_,
-    FileCachePtr cache_,
-    ContextPtr context_,
-    SettingsPtr settings_,
-    GetDiskSettings settings_getter_)
-    : IDiskRemote(name_, s3_root_path_, metadata_disk_, std::move(cache_), "DiskS3", settings_->thread_pool_size)
-    , bucket(std::move(bucket_))
-    , version_id(std::move(version_id_))
-    , current_settings(std::move(settings_))
-    , settings_getter(settings_getter_)
-    , context(context_)
-{
-}
-
-void DiskS3::removeFromRemoteFS(const std::vector<String> & paths)
-{
-    auto settings = current_settings.get();
-
-    size_t chunk_size_limit = settings->objects_chunk_size_to_delete;
-    size_t current_position = 0;
-    while (current_position < paths.size())
-    {
-        std::vector<Aws::S3::Model::ObjectIdentifier> current_chunk;
-        String keys;
-        for (; current_position < paths.size() && current_chunk.size() < chunk_size_limit; ++current_position)
-        {
-            Aws::S3::Model::ObjectIdentifier obj;
-            obj.SetKey(paths[current_position]);
-            current_chunk.push_back(obj);
-
-            if (!keys.empty())
-                keys += ", ";
-            keys += paths[current_position];
-        }
-
-        LOG_TRACE(log, "Remove AWS keys {}", keys);
-        Aws::S3::Model::Delete delkeys;
-        delkeys.SetObjects(current_chunk);
-        Aws::S3::Model::DeleteObjectsRequest request;
-        request.SetBucket(bucket);
-        request.SetDelete(delkeys);
-        auto outcome = settings->client->DeleteObjects(request);
-        logIfError(outcome, [&](){return "Can't remove AWS keys: " + keys;});
-    }
-}
-
-void DiskS3::moveFile(const String & from_path, const String & to_path)
-{
-    auto settings = current_settings.get();
-
-    moveFile(from_path, to_path, settings->send_metadata);
-}
-
-void DiskS3::moveFile(const String & from_path, const String & to_path, bool send_metadata)
-{
-    if (exists(to_path))
-        throw Exception("File already exists: " + to_path, ErrorCodes::FILE_ALREADY_EXISTS);
-
-    if (send_metadata)
-    {
-        auto revision = ++revision_counter;
-        const ObjectMetadata object_metadata {
-            {"from_path", from_path},
-            {"to_path", to_path}
-        };
-        createFileOperationObject("rename", revision, object_metadata);
-    }
-    metadata_disk->moveFile(from_path, to_path);
-}
-
-std::unique_ptr<ReadBufferFromFileBase> DiskS3::readFile(const String & path, const ReadSettings & read_settings, std::optional<size_t>, std::optional<size_t>) const
-{
-    auto settings = current_settings.get();
-    auto metadata = readMetadata(path);
-
-    LOG_TEST(log, "Read from file by path: {}. Existing S3 objects: {}",
-        backQuote(metadata_disk->getPath() + path), metadata.remote_fs_objects.size());
-
-    ReadSettings disk_read_settings{read_settings};
-    if (cache)
-    {
-        if (IFileCache::isReadOnly())
-            disk_read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
-
-        disk_read_settings.remote_fs_cache = cache;
-    }
-
-    auto s3_impl = std::make_unique<ReadBufferFromS3Gather>(
-        settings->client, bucket, version_id, metadata.remote_fs_root_path, metadata.remote_fs_objects,
-        settings->s3_settings.max_single_read_retries, disk_read_settings);
-
-    if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
-    {
-        auto reader = getThreadPoolReader();
-        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, disk_read_settings, std::move(s3_impl));
-    }
-    else
-    {
-        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(s3_impl));
-        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings->min_bytes_for_seek);
-    }
-}
-
-std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings & write_settings)
-{
-    auto settings = current_settings.get();
-
-    /// Path to store new S3 object.
-    auto blob_name = getRandomASCIIString();
-
-    std::optional<ObjectMetadata> object_metadata;
-    if (settings->send_metadata)
-    {
-        auto revision = ++revision_counter;
-        object_metadata = {
-            {"path", path}
-        };
-        blob_name = "r" + revisionToString(revision) + "-file-" + blob_name;
-    }
-
-    LOG_TRACE(log, "{} to file by path: {}. S3 path: {}",
-              mode == WriteMode::Rewrite ? "Write" : "Append", backQuote(metadata_disk->getPath() + path), remote_fs_root_path + blob_name);
-
-    bool cache_on_write = cache
-        && fs::path(path).extension() != ".tmp"
-        && write_settings.enable_filesystem_cache_on_write_operations
-        && FileCacheFactory::instance().getSettings(getCacheBasePath()).cache_on_write_operations;
-
-    auto s3_buffer = std::make_unique<WriteBufferFromS3>(
-        settings->client,
-        bucket,
-        fs::path(remote_fs_root_path) / blob_name,
-        settings->s3_settings,
-        std::move(object_metadata),
-        buf_size, threadPoolCallbackRunner(getThreadPoolWriter()), cache_on_write ? cache : nullptr);
-
-    auto create_metadata_callback = [this, path, blob_name, mode] (size_t count)
-    {
-        readOrCreateUpdateAndStoreMetadata(path, mode, false, [blob_name, count] (Metadata & metadata) { metadata.addObject(blob_name, count); return true; });
-    };
-
-    return std::make_unique<WriteIndirectBufferFromRemoteFS>(std::move(s3_buffer), std::move(create_metadata_callback), fs::path(remote_fs_root_path) / blob_name);
-}
-
-void DiskS3::createHardLink(const String & src_path, const String & dst_path)
-{
-    auto settings = current_settings.get();
-    createHardLink(src_path, dst_path, settings->send_metadata);
-}
-
-void DiskS3::createHardLink(const String & src_path, const String & dst_path, bool send_metadata)
-{
-    /// We don't need to record hardlinks created to shadow folder.
-    if (send_metadata && !dst_path.starts_with("shadow/"))
-    {
-        auto revision = ++revision_counter;
-        const ObjectMetadata object_metadata {
-            {"src_path", src_path},
-            {"dst_path", dst_path}
-        };
-        createFileOperationObject("hardlink", revision, object_metadata);
-    }
-
-    IDiskRemote::createHardLink(src_path, dst_path);
-}
-
-void DiskS3::shutdown()
-{
-    auto settings = current_settings.get();
-    /// This call stops any next retry attempts for ongoing S3 requests.
-    /// If S3 request is failed and the method below is executed S3 client immediately returns the last failed S3 request outcome.
-    /// If S3 is healthy nothing wrong will be happened and S3 requests will be processed in a regular way without errors.
-    /// This should significantly speed up shutdown process if S3 is unhealthy.
-    settings->client->DisableRequestProcessing();
-}
-
-void DiskS3::createFileOperationObject(const String & operation_name, UInt64 revision, const DiskS3::ObjectMetadata & metadata)
-{
-    auto settings = current_settings.get();
-    const String key = "operations/r" + revisionToString(revision) + "-" + operation_name;
-    WriteBufferFromS3 buffer(
-        settings->client,
-        bucket,
-        remote_fs_root_path + key,
-        settings->s3_settings,
-        metadata);
-
-    buffer.write('0');
-    buffer.finalize();
-}
-
-void DiskS3::startup()
-{
-    auto settings = current_settings.get();
-
-    /// Need to be enabled if it was disabled during shutdown() call.
-    settings->client->EnableRequestProcessing();
-
-    if (!settings->send_metadata)
-        return;
-
-    LOG_INFO(log, "Starting up disk {}", name);
-
-    restore();
-
-    if (readSchemaVersion(bucket, remote_fs_root_path) < RESTORABLE_SCHEMA_VERSION)
-        migrateToRestorableSchema();
-
-    findLastRevision();
-
-    LOG_INFO(log, "Disk {} started up", name);
-}
-
-void DiskS3::findLastRevision()
-{
-    /// Construct revision number from high to low bits.
-    String revision;
-    revision.reserve(64);
-    for (int bit = 0; bit < 64; ++bit)
-    {
-        auto revision_prefix = revision + "1";
-
-        LOG_TRACE(log, "Check object exists with revision prefix {}", revision_prefix);
-
-        /// Check file or operation with such revision prefix exists.
-        if (checkObjectExists(bucket, remote_fs_root_path + "r" + revision_prefix)
-            || checkObjectExists(bucket, remote_fs_root_path + "operations/r" + revision_prefix))
-            revision += "1";
-        else
-            revision += "0";
-    }
-    revision_counter = static_cast<UInt64>(std::bitset<64>(revision).to_ullong());
-    LOG_INFO(log, "Found last revision number {} for disk {}", revision_counter, name);
-}
-
-int DiskS3::readSchemaVersion(const String & source_bucket, const String & source_path)
-{
-    int version = 0;
-    if (!checkObjectExists(source_bucket, source_path + SCHEMA_VERSION_OBJECT))
-        return version;
-
-    auto settings = current_settings.get();
-    ReadBufferFromS3 buffer(
-        settings->client,
-        source_bucket,
-        source_path + SCHEMA_VERSION_OBJECT,
-        version_id,
-        settings->s3_settings.max_single_read_retries,
-        context->getReadSettings());
-
-    readIntText(version, buffer);
-
-    return version;
-}
-
-void DiskS3::saveSchemaVersion(const int & version)
-{
-    auto settings = current_settings.get();
-
-    WriteBufferFromS3 buffer(
-        settings->client,
-        bucket,
-        remote_fs_root_path + SCHEMA_VERSION_OBJECT,
-        settings->s3_settings);
-
-    writeIntText(version, buffer);
-    buffer.finalize();
-}
-
-void DiskS3::updateObjectMetadata(const String & key, const ObjectMetadata & metadata)
-{
-    copyObjectImpl(bucket, key, bucket, key, std::nullopt, metadata);
-}
-
-void DiskS3::migrateFileToRestorableSchema(const String & path)
-{
-    LOG_TRACE(log, "Migrate file {} to restorable schema", metadata_disk->getPath() + path);
-
-    auto meta = readMetadata(path);
-
-    for (const auto & [key, _] : meta.remote_fs_objects)
-    {
-        ObjectMetadata metadata {
-            {"path", path}
-        };
-        updateObjectMetadata(remote_fs_root_path + key, metadata);
-    }
-}
-
-void DiskS3::migrateToRestorableSchemaRecursive(const String & path, Futures & results)
-{
-    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
-
-    LOG_TRACE(log, "Migrate directory {} to restorable schema", metadata_disk->getPath() + path);
-
-    bool dir_contains_only_files = true;
-    for (auto it = iterateDirectory(path); it->isValid(); it->next())
-        if (isDirectory(it->path()))
-        {
-            dir_contains_only_files = false;
-            break;
-        }
-
-    /// The whole directory can be migrated asynchronously.
-    if (dir_contains_only_files)
-    {
-        auto result = getExecutor().execute([this, path]
-             {
-                 for (auto it = iterateDirectory(path); it->isValid(); it->next())
-                     migrateFileToRestorableSchema(it->path());
-             });
-
-        results.push_back(std::move(result));
-    }
-    else
-    {
-        for (auto it = iterateDirectory(path); it->isValid(); it->next())
-            if (!isDirectory(it->path()))
-            {
-                auto source_path = it->path();
-                auto result = getExecutor().execute([this, source_path]
-                    {
-                        migrateFileToRestorableSchema(source_path);
-                    });
-
-                results.push_back(std::move(result));
-            }
-            else
-                migrateToRestorableSchemaRecursive(it->path(), results);
-    }
-}
-
-void DiskS3::migrateToRestorableSchema()
-{
-    try
-    {
-        LOG_INFO(log, "Start migration to restorable schema for disk {}", name);
-
-        Futures results;
-
-        for (const auto & root : data_roots)
-            if (exists(root))
-                migrateToRestorableSchemaRecursive(root + '/', results);
-
-        for (auto & result : results)
-            result.wait();
-        for (auto & result : results)
-            result.get();
-
-        saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
-    }
-    catch (const Exception &)
-    {
-        tryLogCurrentException(log, fmt::format("Failed to migrate to restorable schema for disk {}", name));
-
-        throw;
-    }
-}
-
-bool DiskS3::checkObjectExists(const String & source_bucket, const String & prefix) const
-{
-    auto settings = current_settings.get();
-    Aws::S3::Model::ListObjectsV2Request request;
-    request.SetBucket(source_bucket);
-    request.SetPrefix(prefix);
-    request.SetMaxKeys(1);
-
-    auto outcome = settings->client->ListObjectsV2(request);
-    throwIfError(outcome);
-
-    return !outcome.GetResult().GetContents().empty();
-}
-
-bool DiskS3::checkUniqueId(const String & id) const
-{
-    auto settings = current_settings.get();
-    /// Check that we have right s3 and have access rights
-    /// Actually interprets id as s3 object name and checks if it exists
-    Aws::S3::Model::ListObjectsV2Request request;
-    request.SetBucket(bucket);
-    request.SetPrefix(id);
-
-    auto outcome = settings->client->ListObjectsV2(request);
-    throwIfError(outcome);
-
-    Aws::Vector<Aws::S3::Model::Object> object_list = outcome.GetResult().GetContents();
-
-    for (const auto & object : object_list)
-        if (object.GetKey() == id)
-            return true;
-    return false;
-}
-
-Aws::S3::Model::HeadObjectResult DiskS3::headObject(const String & source_bucket, const String & key) const
-{
-    auto settings = current_settings.get();
-    Aws::S3::Model::HeadObjectRequest request;
-    request.SetBucket(source_bucket);
-    request.SetKey(key);
-
-    auto outcome = settings->client->HeadObject(request);
-    throwIfError(outcome);
-
-    return outcome.GetResultWithOwnership();
-}
-
-void DiskS3::listObjects(const String & source_bucket, const String & source_path, std::function<bool(const Aws::S3::Model::ListObjectsV2Result &)> callback) const
-{
-    auto settings = current_settings.get();
-    Aws::S3::Model::ListObjectsV2Request request;
-    request.SetBucket(source_bucket);
-    request.SetPrefix(source_path);
-    request.SetMaxKeys(settings->list_object_keys_size);
-
-    Aws::S3::Model::ListObjectsV2Outcome outcome;
-    do
-    {
-        outcome = settings->client->ListObjectsV2(request);
-        throwIfError(outcome);
-
-        bool should_continue = callback(outcome.GetResult());
-
-        if (!should_continue)
-            break;
-
-        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
-    } while (outcome.GetResult().GetIsTruncated());
-}
-
-void DiskS3::copyObject(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
-    std::optional<Aws::S3::Model::HeadObjectResult> head) const
-{
-    if (head && (head->GetContentLength() >= static_cast<Int64>(5_GiB)))
-        copyObjectMultipartImpl(src_bucket, src_key, dst_bucket, dst_key, head);
-    else
-        copyObjectImpl(src_bucket, src_key, dst_bucket, dst_key);
-}
-
-void DiskS3::copyObjectImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
-    std::optional<Aws::S3::Model::HeadObjectResult> head,
-    std::optional<std::reference_wrapper<const ObjectMetadata>> metadata) const
-{
-    auto settings = current_settings.get();
-    Aws::S3::Model::CopyObjectRequest request;
-    request.SetCopySource(src_bucket + "/" + src_key);
-    request.SetBucket(dst_bucket);
-    request.SetKey(dst_key);
-    if (metadata)
-    {
-        request.SetMetadata(*metadata);
-        request.SetMetadataDirective(Aws::S3::Model::MetadataDirective::REPLACE);
-    }
-
-    auto outcome = settings->client->CopyObject(request);
-
-    if (!outcome.IsSuccess() && outcome.GetError().GetExceptionName() == "EntityTooLarge")
-    { // Can't come here with MinIO, MinIO allows single part upload for large objects.
-        copyObjectMultipartImpl(src_bucket, src_key, dst_bucket, dst_key, head, metadata);
-        return;
-    }
-
-    throwIfError(outcome);
-}
-
-void DiskS3::copyObjectMultipartImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
-    std::optional<Aws::S3::Model::HeadObjectResult> head,
-    std::optional<std::reference_wrapper<const ObjectMetadata>> metadata) const
-{
-    LOG_TRACE(log, "Multipart copy upload has created. Src Bucket: {}, Src Key: {}, Dst Bucket: {}, Dst Key: {}, Metadata: {}",
-        src_bucket, src_key, dst_bucket, dst_key, metadata ? "REPLACE" : "NOT_SET");
-
-    auto settings = current_settings.get();
-
-    if (!head)
-        head = headObject(src_bucket, src_key);
-
-    size_t size = head->GetContentLength();
-
-    String multipart_upload_id;
-
-    {
-        Aws::S3::Model::CreateMultipartUploadRequest request;
-        request.SetBucket(dst_bucket);
-        request.SetKey(dst_key);
-        if (metadata)
-            request.SetMetadata(*metadata);
-
-        auto outcome = settings->client->CreateMultipartUpload(request);
-
-        throwIfError(outcome);
-
-        multipart_upload_id = outcome.GetResult().GetUploadId();
-    }
-
-    std::vector<String> part_tags;
-
-    size_t upload_part_size = settings->s3_settings.min_upload_part_size;
-    for (size_t position = 0, part_number = 1; position < size; ++part_number, position += upload_part_size)
-    {
-        Aws::S3::Model::UploadPartCopyRequest part_request;
-        part_request.SetCopySource(src_bucket + "/" + src_key);
-        part_request.SetBucket(dst_bucket);
-        part_request.SetKey(dst_key);
-        part_request.SetUploadId(multipart_upload_id);
-        part_request.SetPartNumber(part_number);
-        part_request.SetCopySourceRange(fmt::format("bytes={}-{}", position, std::min(size, position + upload_part_size) - 1));
-
-        auto outcome = settings->client->UploadPartCopy(part_request);
-        if (!outcome.IsSuccess())
-        {
-            Aws::S3::Model::AbortMultipartUploadRequest abort_request;
-            abort_request.SetBucket(dst_bucket);
-            abort_request.SetKey(dst_key);
-            abort_request.SetUploadId(multipart_upload_id);
-            settings->client->AbortMultipartUpload(abort_request);
-            // In error case we throw exception later with first error from UploadPartCopy
-        }
-        throwIfError(outcome);
-
-        auto etag = outcome.GetResult().GetCopyPartResult().GetETag();
-        part_tags.push_back(etag);
-    }
-
-    {
-        Aws::S3::Model::CompleteMultipartUploadRequest req;
-        req.SetBucket(dst_bucket);
-        req.SetKey(dst_key);
-        req.SetUploadId(multipart_upload_id);
-
-        Aws::S3::Model::CompletedMultipartUpload multipart_upload;
-        for (size_t i = 0; i < part_tags.size(); ++i)
-        {
-            Aws::S3::Model::CompletedPart part;
-            multipart_upload.AddParts(part.WithETag(part_tags[i]).WithPartNumber(i + 1));
-        }
-
-        req.SetMultipartUpload(multipart_upload);
-
-        auto outcome = settings->client->CompleteMultipartUpload(req);
-
-        throwIfError(outcome);
-
-        LOG_TRACE(log, "Multipart copy upload has completed. Src Bucket: {}, Src Key: {}, Dst Bucket: {}, Dst Key: {}, "
-            "Upload_id: {}, Parts: {}", src_bucket, src_key, dst_bucket, dst_key, multipart_upload_id, part_tags.size());
-    }
-}
-
-struct DiskS3::RestoreInformation
-{
-    UInt64 revision = LATEST_REVISION;
-    String source_bucket;
-    String source_path;
-    bool detached = false;
-};
-
-void DiskS3::readRestoreInformation(DiskS3::RestoreInformation & restore_information)
-{
-    const ReadSettings read_settings;
-    auto buffer = metadata_disk->readFile(RESTORE_FILE_NAME, read_settings, 512);
-    buffer->next();
-
-    try
-    {
-        std::map<String, String> properties;
-
-        while (buffer->hasPendingData())
-        {
-            String property;
-            readText(property, *buffer);
-            assertChar('\n', *buffer);
-
-            auto pos = property.find('=');
-            if (pos == String::npos || pos == 0 || pos == property.length())
-                throw Exception(fmt::format("Invalid property {} in restore file", property), ErrorCodes::UNKNOWN_FORMAT);
-
-            auto key = property.substr(0, pos);
-            auto value = property.substr(pos + 1);
-
-            auto it = properties.find(key);
-            if (it != properties.end())
-                throw Exception(fmt::format("Property key duplication {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
-
-            properties[key] = value;
-        }
-
-        for (const auto & [key, value] : properties)
-        {
-            ReadBufferFromString value_buffer (value);
-
-            if (key == "revision")
-                readIntText(restore_information.revision, value_buffer);
-            else if (key == "source_bucket")
-                readText(restore_information.source_bucket, value_buffer);
-            else if (key == "source_path")
-                readText(restore_information.source_path, value_buffer);
-            else if (key == "detached")
-                readBoolTextWord(restore_information.detached, value_buffer);
-            else
-                throw Exception(fmt::format("Unknown key {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
-        }
-    }
-    catch (const Exception &)
-    {
-        tryLogCurrentException(log, "Failed to read restore information");
-        throw;
-    }
-}
-
-void DiskS3::restore()
-{
-    if (!exists(RESTORE_FILE_NAME))
-        return;
-
-    try
-    {
-        RestoreInformation information;
-        information.source_bucket = bucket;
-        information.source_path = remote_fs_root_path;
-
-        readRestoreInformation(information);
-        if (information.revision == 0)
-            information.revision = LATEST_REVISION;
-        if (!information.source_path.ends_with('/'))
-            information.source_path += '/';
-
-        if (information.source_bucket == bucket)
-        {
-            /// In this case we need to additionally cleanup S3 from objects with later revision.
-            /// Will be simply just restore to different path.
-            if (information.source_path == remote_fs_root_path && information.revision != LATEST_REVISION)
-                throw Exception("Restoring to the same bucket and path is allowed if revision is latest (0)", ErrorCodes::BAD_ARGUMENTS);
-
-            /// This case complicates S3 cleanup in case of unsuccessful restore.
-            if (information.source_path != remote_fs_root_path && remote_fs_root_path.starts_with(information.source_path))
-                throw Exception("Restoring to the same bucket is allowed only if source path is not a sub-path of configured path in S3 disk", ErrorCodes::BAD_ARGUMENTS);
-        }
-
-        LOG_INFO(log, "Starting to restore disk {}. Revision: {}, Source bucket: {}, Source path: {}",
-                 name, information.revision, information.source_bucket, information.source_path);
-
-        if (readSchemaVersion(information.source_bucket, information.source_path) < RESTORABLE_SCHEMA_VERSION)
-            throw Exception("Source bucket doesn't have restorable schema.", ErrorCodes::BAD_ARGUMENTS);
-
-        LOG_INFO(log, "Removing old metadata...");
-
-        bool cleanup_s3 = information.source_bucket != bucket || information.source_path != remote_fs_root_path;
-        for (const auto & root : data_roots)
-            if (exists(root))
-                removeSharedRecursive(root + '/', !cleanup_s3, {});
-
-        restoreFiles(information);
-        restoreFileOperations(information);
-
-        metadata_disk->removeFile(RESTORE_FILE_NAME);
-
-        saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
-
-        LOG_INFO(log, "Restore disk {} finished", name);
-    }
-    catch (const Exception &)
-    {
-        tryLogCurrentException(log, fmt::format("Failed to restore disk {}", name));
-
-        throw;
-    }
-}
-
-void DiskS3::restoreFiles(const RestoreInformation & restore_information)
-{
-    LOG_INFO(log, "Starting restore files for disk {}", name);
-
-    std::vector<std::future<void>> results;
-    auto restore_files = [this, &restore_information, &results](auto list_result)
-    {
-        std::vector<String> keys;
-        for (const auto & row : list_result.GetContents())
-        {
-            const String & key = row.GetKey();
-
-            /// Skip file operations objects. They will be processed separately.
-            if (key.find("/operations/") != String::npos)
-                continue;
-
-            const auto [revision, _] = extractRevisionAndOperationFromKey(key);
-            /// Filter early if it's possible to get revision from key.
-            if (revision > restore_information.revision)
-                continue;
-
-            keys.push_back(key);
-        }
-
-        if (!keys.empty())
-        {
-            auto result = getExecutor().execute([this, &restore_information, keys]()
-            {
-                processRestoreFiles(restore_information.source_bucket, restore_information.source_path, keys);
-            });
-
-            results.push_back(std::move(result));
-        }
-
-        return true;
-    };
-
-    /// Execute.
-    listObjects(restore_information.source_bucket, restore_information.source_path, restore_files);
-
-    for (auto & result : results)
-        result.wait();
-    for (auto & result : results)
-        result.get();
-
-    LOG_INFO(log, "Files are restored for disk {}", name);
-}
-
-void DiskS3::processRestoreFiles(const String & source_bucket, const String & source_path, Strings keys)
-{
-    for (const auto & key : keys)
-    {
-        auto head_result = headObject(source_bucket, key);
-        auto object_metadata = head_result.GetMetadata();
-
-        /// Restore file if object has 'path' in metadata.
-        auto path_entry = object_metadata.find("path");
-        if (path_entry == object_metadata.end())
-        {
-            /// Such keys can remain after migration, we can skip them.
-            LOG_WARNING(log, "Skip key {} because it doesn't have 'path' in metadata", key);
-            continue;
-        }
-
-        const auto & path = path_entry->second;
-
-        createDirectories(directoryPath(path));
-        auto relative_key = shrinkKey(source_path, key);
-
-        /// Copy object if we restore to different bucket / path.
-        if (bucket != source_bucket || remote_fs_root_path != source_path)
-            copyObject(source_bucket, key, bucket, remote_fs_root_path + relative_key, head_result);
-
-        auto updater = [relative_key, head_result] (Metadata & metadata)
-        {
-            metadata.addObject(relative_key, head_result.GetContentLength());
-            return true;
-        };
-
-        createUpdateAndStoreMetadata(path, false, updater);
-
-        LOG_TRACE(log, "Restored file {}", path);
-    }
-}
-
-void DiskS3::restoreFileOperations(const RestoreInformation & restore_information)
-{
-    auto settings = current_settings.get();
-
-    LOG_INFO(log, "Starting restore file operations for disk {}", name);
-
-    /// Enable recording file operations if we restore to different bucket / path.
-    bool send_metadata = bucket != restore_information.source_bucket || remote_fs_root_path != restore_information.source_path;
-
-    std::set<String> renames;
-    auto restore_file_operations = [this, &restore_information, &renames, &send_metadata](auto list_result)
-    {
-        const String rename = "rename";
-        const String hardlink = "hardlink";
-
-        for (const auto & row : list_result.GetContents())
-        {
-            const String & key = row.GetKey();
-
-            const auto [revision, operation] = extractRevisionAndOperationFromKey(key);
-            if (revision == UNKNOWN_REVISION)
-            {
-                LOG_WARNING(log, "Skip key {} with unknown revision", key);
-                continue;
-            }
-
-            /// S3 ensures that keys will be listed in ascending UTF-8 bytes order (revision order).
-            /// We can stop processing if revision of the object is already more than required.
-            if (revision > restore_information.revision)
-                return false;
-
-            /// Keep original revision if restore to different bucket / path.
-            if (send_metadata)
-                revision_counter = revision - 1;
-
-            auto object_metadata = headObject(restore_information.source_bucket, key).GetMetadata();
-            if (operation == rename)
-            {
-                auto from_path = object_metadata["from_path"];
-                auto to_path = object_metadata["to_path"];
-                if (exists(from_path))
-                {
-                    moveFile(from_path, to_path, send_metadata);
-                    LOG_TRACE(log, "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
-
-                    if (restore_information.detached && isDirectory(to_path))
-                    {
-                        /// Sometimes directory paths are passed without trailing '/'. We should keep them in one consistent way.
-                        if (!from_path.ends_with('/'))
-                            from_path += '/';
-                        if (!to_path.ends_with('/'))
-                            to_path += '/';
-
-                        /// Always keep latest actual directory path to avoid 'detaching' not existing paths.
-                        auto it = renames.find(from_path);
-                        if (it != renames.end())
-                            renames.erase(it);
-
-                        renames.insert(to_path);
-                    }
-                }
-            }
-            else if (operation == hardlink)
-            {
-                auto src_path = object_metadata["src_path"];
-                auto dst_path = object_metadata["dst_path"];
-                if (exists(src_path))
-                {
-                    createDirectories(directoryPath(dst_path));
-                    createHardLink(src_path, dst_path, send_metadata);
-                    LOG_TRACE(log, "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
-                }
-            }
-        }
-
-        return true;
-    };
-
-    /// Execute.
-    listObjects(restore_information.source_bucket, restore_information.source_path + "operations/", restore_file_operations);
-
-    if (restore_information.detached)
-    {
-        Strings not_finished_prefixes{"tmp_", "delete_tmp_", "attaching_", "deleting_"};
-
-        for (const auto & path : renames)
-        {
-            /// Skip already detached parts.
-            if (path.find("/detached/") != std::string::npos)
-                continue;
-
-            /// Skip not finished parts. They shouldn't be in 'detached' directory, because CH wouldn't be able to finish processing them.
-            fs::path directory_path(path);
-            auto directory_name = directory_path.parent_path().filename().string();
-
-            auto predicate = [&directory_name](String & prefix) { return directory_name.starts_with(prefix); };
-            if (std::any_of(not_finished_prefixes.begin(), not_finished_prefixes.end(), predicate))
-                continue;
-
-            auto detached_path = pathToDetached(path);
-
-            LOG_TRACE(log, "Move directory to 'detached' {} -> {}", path, detached_path);
-
-            fs::path from_path = fs::path(path);
-            fs::path to_path = fs::path(detached_path);
-            if (path.ends_with('/'))
-                to_path /= from_path.parent_path().filename();
-            else
-                to_path /= from_path.filename();
-
-            /// to_path may exist and non-empty in case for example abrupt restart, so remove it before rename
-            if (metadata_disk->exists(to_path))
-                metadata_disk->removeRecursive(to_path);
-
-            createDirectories(directoryPath(to_path));
-            metadata_disk->moveDirectory(from_path, to_path);
-        }
-    }
-
-    LOG_INFO(log, "File operations restored for disk {}", name);
-}
-
-std::tuple<UInt64, String> DiskS3::extractRevisionAndOperationFromKey(const String & key)
-{
-    String revision_str;
-    String operation;
-
-    re2::RE2::FullMatch(key, key_regexp, &revision_str, &operation);
-
-    return {(revision_str.empty() ? UNKNOWN_REVISION : static_cast<UInt64>(std::bitset<64>(revision_str).to_ullong())), operation};
-}
-
-String DiskS3::shrinkKey(const String & path, const String & key)
-{
-    if (!key.starts_with(path))
-        throw Exception("The key " + key + " prefix mismatch with given " + path, ErrorCodes::LOGICAL_ERROR);
-
-    return key.substr(path.length());
-}
-
-String DiskS3::revisionToString(UInt64 revision)
-{
-    return std::bitset<64>(revision).to_string();
-}
-
-String DiskS3::pathToDetached(const String & source_path)
-{
-    if (source_path.ends_with('/'))
-        return fs::path(source_path).parent_path().parent_path() / "detached/";
-    return fs::path(source_path).parent_path() / "detached/";
-}
-
-void DiskS3::onFreeze(const String & path)
-{
-    createDirectories(path);
-    auto revision_file_buf = metadata_disk->writeFile(path + "revision.txt", 32);
-    writeIntText(revision_counter.load(), *revision_file_buf);
-    revision_file_buf->finalize();
-}
-
-void DiskS3::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context_, const String &, const DisksMap &)
-{
-    auto new_settings = settings_getter(config, "storage_configuration.disks." + name, context_);
-
-    current_settings.set(std::move(new_settings));
-
-    if (AsyncExecutor * exec = dynamic_cast<AsyncExecutor*>(&getExecutor()))
-        exec->setMaxThreads(current_settings.get()->thread_pool_size);
-}
-
-DiskS3Settings::DiskS3Settings(
-    const std::shared_ptr<Aws::S3::S3Client> & client_,
-    const S3Settings::ReadWriteSettings & s3_settings_,
-    size_t min_bytes_for_seek_,
-    bool send_metadata_,
-    int thread_pool_size_,
-    int list_object_keys_size_,
-    int objects_chunk_size_to_delete_)
-    : client(client_)
-    , s3_settings(s3_settings_)
-    , min_bytes_for_seek(min_bytes_for_seek_)
-    , send_metadata(send_metadata_)
-    , thread_pool_size(thread_pool_size_)
-    , list_object_keys_size(list_object_keys_size_)
-    , objects_chunk_size_to_delete(objects_chunk_size_to_delete_)
-{
-}
-
-}
-
-#endif
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
deleted file mode 100644
index a909d08f6fa..00000000000
--- a/src/Disks/S3/DiskS3.h
+++ /dev/null
@@ -1,189 +0,0 @@
-#pragma once
-
-#include <Common/config.h>
-
-#if USE_AWS_S3
-
-#include <atomic>
-#include <optional>
-#include <Common/logger_useful.h>
-#include "Disks/DiskFactory.h"
-#include "Disks/Executor.h"
-
-#include <aws/s3/S3Client.h>
-#include <aws/s3/model/HeadObjectResult.h>
-#include <aws/s3/model/ListObjectsV2Result.h>
-
-#include <Poco/DirectoryIterator.h>
-#include <re2/re2.h>
-#include <Disks/IDiskRemote.h>
-#include <Common/FileCache_fwd.h>
-#include <Storages/StorageS3Settings.h>
-
-
-namespace DB
-{
-
-/// Settings for DiskS3 that can be changed in runtime.
-struct DiskS3Settings
-{
-    DiskS3Settings(
-        const std::shared_ptr<Aws::S3::S3Client> & client_,
-        const S3Settings::ReadWriteSettings & s3_settings_,
-        size_t min_bytes_for_seek_,
-        bool send_metadata_,
-        int thread_pool_size_,
-        int list_object_keys_size_,
-        int objects_chunk_size_to_delete_);
-
-    std::shared_ptr<Aws::S3::S3Client> client;
-    S3Settings::ReadWriteSettings s3_settings;
-    size_t min_bytes_for_seek;
-    bool send_metadata;
-    int thread_pool_size;
-    int list_object_keys_size;
-    int objects_chunk_size_to_delete;
-};
-
-
-/**
- * Storage for persisting data in S3 and metadata on the local disk.
- * Files are represented by file in local filesystem (clickhouse_root/disks/disk_name/path/to/file)
- * that contains S3 object key with actual data.
- */
-class DiskS3 final : public IDiskRemote
-{
-public:
-    using ObjectMetadata = std::map<std::string, std::string>;
-    using Futures = std::vector<std::future<void>>;
-
-    using SettingsPtr = std::unique_ptr<DiskS3Settings>;
-    using GetDiskSettings = std::function<SettingsPtr(const Poco::Util::AbstractConfiguration &, const String, ContextPtr)>;
-
-    struct RestoreInformation;
-
-    DiskS3(
-        String name_,
-        String bucket_,
-        String s3_root_path_,
-        String version_id_,
-        DiskPtr metadata_disk_,
-        FileCachePtr cache_,
-        ContextPtr context_,
-        SettingsPtr settings_,
-        GetDiskSettings settings_getter_);
-
-    std::unique_ptr<ReadBufferFromFileBase> readFile(
-        const String & path,
-        const ReadSettings & settings,
-        std::optional<size_t> read_hint,
-        std::optional<size_t> file_size) const override;
-
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(
-        const String & path,
-        size_t buf_size,
-        WriteMode mode,
-        const WriteSettings & settings) override;
-
-    void removeFromRemoteFS(const std::vector<String> & paths) override;
-
-    void moveFile(const String & from_path, const String & to_path, bool send_metadata);
-    void moveFile(const String & from_path, const String & to_path) override;
-
-    void createHardLink(const String & src_path, const String & dst_path) override;
-    void createHardLink(const String & src_path, const String & dst_path, bool send_metadata);
-
-    DiskType getType() const override { return DiskType::S3; }
-    bool isRemote() const override { return true; }
-
-    bool supportZeroCopyReplication() const override { return true; }
-
-    bool supportParallelWrite() const override { return true; }
-
-    void shutdown() override;
-
-    void startup() override;
-
-    /// Check file exists and ClickHouse has an access to it
-    /// Overrode in remote disk
-    /// Required for remote disk to ensure that replica has access to data written by other node
-    bool checkUniqueId(const String & id) const override;
-
-    /// Dumps current revision counter into file 'revision.txt' at given path.
-    void onFreeze(const String & path) override;
-
-    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String &, const DisksMap &) override;
-
-private:
-    void createFileOperationObject(const String & operation_name, UInt64 revision, const ObjectMetadata & metadata);
-    /// Converts revision to binary string with leading zeroes (64 bit).
-    static String revisionToString(UInt64 revision);
-
-    bool checkObjectExists(const String & source_bucket, const String & prefix) const;
-    void findLastRevision();
-
-    int readSchemaVersion(const String & source_bucket, const String & source_path);
-    void saveSchemaVersion(const int & version);
-    void updateObjectMetadata(const String & key, const ObjectMetadata & metadata);
-    void migrateFileToRestorableSchema(const String & path);
-    void migrateToRestorableSchemaRecursive(const String & path, Futures & results);
-    void migrateToRestorableSchema();
-
-    Aws::S3::Model::HeadObjectResult headObject(const String & source_bucket, const String & key) const;
-    void listObjects(const String & source_bucket, const String & source_path, std::function<bool(const Aws::S3::Model::ListObjectsV2Result &)> callback) const;
-    void copyObject(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
-        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt) const;
-
-    void copyObjectImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
-        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt,
-        std::optional<std::reference_wrapper<const ObjectMetadata>> metadata = std::nullopt) const;
-    void copyObjectMultipartImpl(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key,
-        std::optional<Aws::S3::Model::HeadObjectResult> head = std::nullopt,
-        std::optional<std::reference_wrapper<const ObjectMetadata>> metadata = std::nullopt) const;
-
-    /// Restore S3 metadata files on file system.
-    void restore();
-    void readRestoreInformation(RestoreInformation & restore_information);
-    void restoreFiles(const RestoreInformation & restore_information);
-    void processRestoreFiles(const String & source_bucket, const String & source_path, std::vector<String> keys);
-    void restoreFileOperations(const RestoreInformation & restore_information);
-
-    /// Remove 'path' prefix from 'key' to get relative key.
-    /// It's needed to store keys to metadata files in RELATIVE_PATHS version.
-    static String shrinkKey(const String & path, const String & key);
-    std::tuple<UInt64, String> extractRevisionAndOperationFromKey(const String & key);
-
-    /// Forms detached path '../../detached/part_name/' from '../../part_name/'
-    static String pathToDetached(const String & source_path);
-
-    const String bucket;
-
-    const String version_id;
-
-    MultiVersion<DiskS3Settings> current_settings;
-    /// Gets disk settings from context.
-    GetDiskSettings settings_getter;
-
-    std::atomic<UInt64> revision_counter = 0;
-    static constexpr UInt64 LATEST_REVISION = std::numeric_limits<UInt64>::max();
-    static constexpr UInt64 UNKNOWN_REVISION = 0;
-
-    /// File at path {metadata_path}/restore contains metadata restore information
-    inline static const String RESTORE_FILE_NAME = "restore";
-
-    /// Key has format: ../../r{revision}-{operation}
-    const re2::RE2 key_regexp {".*/r(\\d+)-(\\w+)$"};
-
-    /// Object contains information about schema version.
-    inline static const String SCHEMA_VERSION_OBJECT = ".SCHEMA_VERSION";
-    /// Version with possibility to backup-restore metadata.
-    static constexpr int RESTORABLE_SCHEMA_VERSION = 1;
-    /// Directories with data.
-    const std::vector<String> data_roots {"data", "store"};
-
-    ContextPtr context;
-};
-
-}
-
-#endif
diff --git a/src/Disks/WriteMode.h b/src/Disks/WriteMode.h
new file mode 100644
index 00000000000..4a73e92ccab
--- /dev/null
+++ b/src/Disks/WriteMode.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace DB
+{
+
+/**
+ * Mode of opening a file for write.
+ */
+enum class WriteMode
+{
+    Rewrite,
+    Append
+};
+
+}
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 644e4d3ecfd..71231d7424d 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -66,6 +66,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.csv.null_representation = settings.format_csv_null_representation;
     format_settings.csv.input_format_arrays_as_nested_csv = settings.input_format_csv_arrays_as_nested_csv;
     format_settings.csv.input_format_use_best_effort_in_schema_inference = settings.input_format_csv_use_best_effort_in_schema_inference;
+    format_settings.csv.skip_first_lines = settings.input_format_csv_skip_first_lines;
     format_settings.hive_text.fields_delimiter = settings.input_format_hive_text_fields_delimiter;
     format_settings.hive_text.collection_items_delimiter = settings.input_format_hive_text_collection_items_delimiter;
     format_settings.hive_text.map_keys_delimiter = settings.input_format_hive_text_map_keys_delimiter;
@@ -123,6 +124,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.tsv.input_format_enum_as_number = settings.input_format_tsv_enum_as_number;
     format_settings.tsv.null_representation = settings.format_tsv_null_representation;
     format_settings.tsv.input_format_use_best_effort_in_schema_inference = settings.input_format_tsv_use_best_effort_in_schema_inference;
+    format_settings.tsv.skip_first_lines = settings.input_format_tsv_skip_first_lines;
     format_settings.values.accurate_types_of_literals = settings.input_format_values_accurate_types_of_literals;
     format_settings.values.deduce_templates_of_expressions = settings.input_format_values_deduce_templates_of_expressions;
     format_settings.values.interpret_expressions = settings.input_format_values_interpret_expressions;
@@ -492,10 +494,9 @@ String FormatFactory::getFormatFromFileName(String file_name, bool throw_if_not_
 String FormatFactory::getFormatFromFileDescriptor(int fd)
 {
 #ifdef OS_LINUX
-    char buf[32] = {'\0'};
-    snprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd);
+    std::string proc_path = fmt::format("/proc/self/fd/{}", fd);
     char file_path[PATH_MAX] = {'\0'};
-    if (readlink(buf, file_path, sizeof(file_path) - 1) != -1)
+    if (readlink(proc_path.c_str(), file_path, sizeof(file_path) - 1) != -1)
         return getFormatFromFileName(file_path, false);
     return "";
 #elif defined(__APPLE__)
@@ -585,6 +586,13 @@ bool FormatFactory::checkIfFormatHasAnySchemaReader(const String & name) const
     return checkIfFormatHasSchemaReader(name) || checkIfFormatHasExternalSchemaReader(name);
 }
 
+void FormatFactory::checkFormatName(const String & name) const
+{
+    auto it = dict.find(name);
+    if (it == dict.end())
+        throw Exception("Unknown format " + name, ErrorCodes::UNKNOWN_FORMAT);
+}
+
 FormatFactory & FormatFactory::instance()
 {
     static FormatFactory ret;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 8e949a3e367..260f8197d5e 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -210,6 +210,9 @@ public:
     bool isInputFormat(const String & name) const;
     bool isOutputFormat(const String & name) const;
 
+    /// Check that format with specified name exists and throw an exception otherwise.
+    void checkFormatName(const String & name) const;
+
 private:
     FormatsDictionary dict;
     FileExtensionFormats file_extension_formats;
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index e6f0a7d229e..eabfa2ad58b 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -109,6 +109,7 @@ struct FormatSettings
         String null_representation = "\\N";
         char tuple_delimiter = ',';
         bool input_format_use_best_effort_in_schema_inference = true;
+        UInt64 skip_first_lines = 0;
     } csv;
 
     struct HiveText
@@ -219,6 +220,7 @@ struct FormatSettings
         String null_representation = "\\N";
         bool input_format_enum_as_number = false;
         bool input_format_use_best_effort_in_schema_inference = true;
+        UInt64 skip_first_lines = 0;
     } tsv;
 
     struct
diff --git a/src/Functions/CRC.cpp b/src/Functions/CRC.cpp
index abcf137f2e7..b7c6c1195ea 100644
--- a/src/Functions/CRC.cpp
+++ b/src/Functions/CRC.cpp
@@ -118,7 +118,7 @@ struct CRCFunctionWrapper
 private:
     static ReturnType doCRC(const ColumnString::Chars & buf, size_t offset, size_t size)
     {
-        const unsigned char * p = reinterpret_cast<const unsigned char *>(&buf[0]) + offset;
+        const unsigned char * p = reinterpret_cast<const unsigned char *>(buf.data()) + offset;
         return Impl::makeCRC(p, size);
     }
 };
diff --git a/src/Functions/CastOverloadResolver.h b/src/Functions/CastOverloadResolver.h
index cff17d810fe..9b579c34923 100644
--- a/src/Functions/CastOverloadResolver.h
+++ b/src/Functions/CastOverloadResolver.h
@@ -98,6 +98,7 @@ protected:
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
 private:
diff --git a/src/Functions/FunctionShowCertificate.cpp b/src/Functions/FunctionShowCertificate.cpp
new file mode 100644
index 00000000000..e978f77244c
--- /dev/null
+++ b/src/Functions/FunctionShowCertificate.cpp
@@ -0,0 +1,12 @@
+#include "FunctionShowCertificate.h"
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
+
+void registerFunctionShowCertificate(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionShowCertificate>();
+}
+
+}
diff --git a/src/Functions/FunctionShowCertificate.h b/src/Functions/FunctionShowCertificate.h
new file mode 100644
index 00000000000..bb3c0fd8299
--- /dev/null
+++ b/src/Functions/FunctionShowCertificate.h
@@ -0,0 +1,189 @@
+#pragma once
+
+#include <Common/config.h>
+
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context.h>
+
+#if USE_SSL
+    #include <openssl/x509v3.h>
+    #include "Poco/Net/SSLManager.h"
+    #include "Poco/Crypto/X509Certificate.h"
+#endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SUPPORT_IS_DISABLED;
+}
+
+// showCertificate()
+class FunctionShowCertificate : public IFunction
+{
+public:
+    static constexpr auto name = "showCertificate";
+
+    static FunctionPtr create(ContextPtr)
+    {
+#if !defined(USE_SSL) || USE_SSL == 0
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSL support is disabled");
+#endif
+        return std::make_shared<FunctionShowCertificate>();
+    }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>());
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        MutableColumnPtr keys = DataTypeString().createColumn();
+        MutableColumnPtr values = DataTypeString().createColumn();
+        MutableColumnPtr offsets = DataTypeNumber<IColumn::Offset>().createColumn();
+
+        if (input_rows_count)
+        {
+#if USE_SSL
+            if (const X509 * cert = SSL_CTX_get0_certificate(Poco::Net::SSLManager::instance().defaultServerContext()->sslContext()))
+            {
+                BIO * b = BIO_new(BIO_s_mem());
+                SCOPE_EXIT(
+                {
+                    BIO_free(b);
+                });
+
+                keys->insert("version");
+                values->insert(std::to_string(X509_get_version(cert) + 1));
+
+                {
+                    char buf[1024] = {0};
+                    const ASN1_INTEGER * sn = cert->cert_info->serialNumber;
+                    BIGNUM * bnsn = ASN1_INTEGER_to_BN(sn, nullptr);
+                    SCOPE_EXIT(
+                    {
+                        BN_free(bnsn);
+                    });
+                    if (BN_print(b, bnsn) > 0 && BIO_read(b, buf, sizeof(buf)) > 0)
+                    {
+                        keys->insert("serial_number");
+                        values->insert(buf);
+                    }
+
+                }
+
+                {
+                    const ASN1_BIT_STRING *sig = nullptr;
+                    const X509_ALGOR *al = nullptr;
+                    char buf[1024] = {0};
+                    X509_get0_signature(&sig, &al, cert);
+                    if (al)
+                    {
+                        OBJ_obj2txt(buf, sizeof(buf), al->algorithm, 0);
+                        keys->insert("signature_algo");
+                        values->insert(buf);
+                    }
+                }
+
+                char * issuer = X509_NAME_oneline(cert->cert_info->issuer, nullptr, 0);
+                if (issuer)
+                {
+                    SCOPE_EXIT(
+                    {
+                        OPENSSL_free(issuer);
+                    });
+                    keys->insert("issuer");
+                    values->insert(issuer);
+                }
+
+                {
+                    char buf[1024] = {0};
+                    if (ASN1_TIME_print(b, X509_get_notBefore(cert)) && BIO_read(b, buf, sizeof(buf)) > 0)
+                    {
+                        keys->insert("not_before");
+                        values->insert(buf);
+                    }
+                }
+
+                {
+                    char buf[1024] = {0};
+                    if (ASN1_TIME_print(b, X509_get_notAfter(cert)) && BIO_read(b, buf, sizeof(buf)) > 0)
+                    {
+                        keys->insert("not_after");
+                        values->insert(buf);
+                    }
+                }
+
+                char * subject = X509_NAME_oneline(cert->cert_info->subject, nullptr, 0);
+                if (subject)
+                {
+                    SCOPE_EXIT(
+                    {
+                        OPENSSL_free(subject);
+                    });
+                    keys->insert("subject");
+                    values->insert(subject);
+                }
+
+                if (X509_PUBKEY * pkey = X509_get_X509_PUBKEY(cert))
+                {
+                    char buf[1024] = {0};
+                    ASN1_OBJECT *ppkalg = nullptr;
+                    const unsigned char *pk = nullptr;
+                    int ppklen = 0;
+                    X509_ALGOR *pa = nullptr;
+                    if (X509_PUBKEY_get0_param(&ppkalg, &pk, &ppklen, &pa, pkey) &&
+                        i2a_ASN1_OBJECT(b, ppkalg) > 0 && BIO_read(b, buf, sizeof(buf)) > 0)
+                    {
+                        keys->insert("pkey_algo");
+                        values->insert(buf);
+                    }
+                }
+            }
+            offsets->insert(keys->size());
+#endif
+        }
+
+        size_t sz = keys->size();
+
+        if (sz && input_rows_count > 1)
+        {
+            keys->reserve(sz * input_rows_count);
+            values->reserve(sz * input_rows_count);
+            offsets->reserve(input_rows_count);
+        }
+
+        for (size_t i = 1; i < input_rows_count; ++i)
+        {
+            for (size_t j = 0; j < sz; ++j)
+            {
+                keys->insertFrom(*keys, j);
+                values->insertFrom(*values, j);
+            }
+            offsets->insert(keys->size());
+        }
+
+        auto nested_column = ColumnArray::create(
+            ColumnTuple::create(Columns{std::move(keys), std::move(values)}), std::move(offsets));
+
+        return ColumnMap::create(nested_column);
+    }
+};
+
+}
diff --git a/src/Functions/FunctionsBinaryRepresentation.cpp b/src/Functions/FunctionsBinaryRepresentation.cpp
index 582dd1f1049..a13558133d3 100644
--- a/src/Functions/FunctionsBinaryRepresentation.cpp
+++ b/src/Functions/FunctionsBinaryRepresentation.cpp
@@ -91,7 +91,7 @@ struct HexImpl
         out_vec.resize(size * hex_length);
 
         size_t pos = 0;
-        char * out = reinterpret_cast<char *>(&out_vec[0]);
+        char * out = reinterpret_cast<char *>(out_vec.data());
         for (size_t i = 0; i < size; ++i)
         {
             const UInt8 * in_pos = reinterpret_cast<const UInt8 *>(&in_vec[i]);
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index ba3c9d68241..bffc15cdc57 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -2516,6 +2516,8 @@ protected:
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    /// CAST(Nothing, T) -> T
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index 6b83f761086..0cd56f87df4 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -24,8 +24,8 @@ void registerFunctionsExternalDictionaries(FunctionFactory & factory)
     factory.registerFunction<FunctionDictGetString>();
     factory.registerFunction<FunctionDictGetHierarchy>();
     factory.registerFunction<FunctionDictIsIn>();
-    factory.registerFunction<FunctionDictGetChildren>();
-    factory.registerFunction<FunctionDictGetDescendants>();
+    factory.registerFunction<FunctionDictGetChildrenOverloadResolver>();
+    factory.registerFunction<FunctionDictGetDescendantsOverloadResolver>();
     factory.registerFunction<FunctionDictGetUInt8OrDefault>();
     factory.registerFunction<FunctionDictGetUInt16OrDefault>();
     factory.registerFunction<FunctionDictGetUInt32OrDefault>();
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 189ec7321c1..03833f9a2b2 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -1053,86 +1053,159 @@ private:
     mutable FunctionDictHelper helper;
 };
 
-class FunctionDictGetChildren final : public IFunction
+class FunctionDictGetDescendantsExecutable final : public IExecutableFunction
 {
 public:
-    static constexpr auto name = "dictGetChildren";
-
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionDictGetChildren>(context);
-    }
-
-    explicit FunctionDictGetChildren(ContextPtr context_)
-        : helper(context_) {}
+    FunctionDictGetDescendantsExecutable(
+        String name_,
+        size_t level_,
+        DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index,
+        std::shared_ptr<FunctionDictHelper> dictionary_helper_)
+        : name(std::move(name_))
+        , level(level_)
+        , hierarchical_parent_to_child_index(std::move(hierarchical_parent_to_child_index))
+        , dictionary_helper(std::move(dictionary_helper_))
+    {}
 
     String getName() const override { return name; }
 
-private:
-    size_t getNumberOfArguments() const override { return 2; }
+    bool useDefaultImplementationForConstants() const override { return true; }
 
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
-    bool isDeterministic() const override { return false; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        if (!isString(arguments[0].type))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of first argument of function {}. Expected String. Actual type {}",
-                getName(),
-                arguments[0].type->getName());
-
-        auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
-
-        return std::make_shared<DataTypeArray>(hierarchical_attribute.type);
-    }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 2}; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
+        auto dictionary = dictionary_helper->getDictionary(arguments[0].column);
+        const auto & hierarchical_attribute = dictionary_helper->getDictionaryHierarchicalAttribute(dictionary);
 
         auto key_column = ColumnWithTypeAndName{arguments[1].column->convertToFullColumnIfConst(), arguments[1].type, arguments[1].name};
         auto key_column_casted = castColumnAccurate(key_column, hierarchical_attribute.type);
 
-        ColumnPtr result = dictionary->getDescendants(key_column_casted, hierarchical_attribute.type, 1);
-
+        ColumnPtr result = dictionary->getDescendants(key_column_casted, hierarchical_attribute.type, level, hierarchical_parent_to_child_index);
         return result;
     }
 
-    mutable FunctionDictHelper helper;
+    String name;
+    size_t level;
+    DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index;
+    std::shared_ptr<FunctionDictHelper> dictionary_helper;
 };
 
-class FunctionDictGetDescendants final : public IFunction
+class FunctionDictGetDescendantsBase final : public IFunctionBase
 {
 public:
-    static constexpr auto name = "dictGetDescendants";
-
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionDictGetDescendants>(context);
-    }
-
-    explicit FunctionDictGetDescendants(ContextPtr context_)
-        : helper(context_) {}
+    FunctionDictGetDescendantsBase(
+        String name_,
+        const DataTypes & argument_types_,
+        const DataTypePtr & result_type_,
+        size_t level_,
+        DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index,
+        std::shared_ptr<FunctionDictHelper> helper_)
+        : name(std::move(name_))
+        , argument_types(argument_types_)
+        , result_type(result_type_)
+        , level(level_)
+        , hierarchical_parent_to_child_index(std::move(hierarchical_parent_to_child_index))
+        , helper(std::move(helper_))
+    {}
 
     String getName() const override { return name; }
 
-private:
-    size_t getNumberOfArguments() const override { return 0; }
-    bool isVariadic() const override { return true; }
+    const DataTypes & getArgumentTypes() const override { return argument_types; }
+
+    const DataTypePtr & getResultType() const override { return result_type; }
 
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 2}; }
-    bool isDeterministic() const override { return false; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_shared<FunctionDictGetDescendantsExecutable>(name, level, hierarchical_parent_to_child_index, helper);
+    }
+
+    String name;
+    DataTypes argument_types;
+    DataTypePtr result_type;
+    size_t level;
+    DictionaryHierarchicalParentToChildIndexPtr hierarchical_parent_to_child_index;
+    std::shared_ptr<FunctionDictHelper> helper;
+};
+
+struct FunctionDictGetDescendantsStrategy
+{
+    static constexpr auto name = "dictGetDescendants";
+    static constexpr size_t default_level = 0;
+    static constexpr size_t number_of_arguments = 0;
+    static constexpr bool is_variadic = true;
+};
+
+struct FunctionDictGetChildrenStrategy
+{
+    static constexpr auto name = "dictGetChildren";
+    static constexpr size_t default_level = 1;
+    static constexpr size_t number_of_arguments = 2;
+    static constexpr bool is_variadic = false;
+};
+
+template <typename Strategy>
+class FunctionDictGetDescendantsOverloadResolverImpl final : public IFunctionOverloadResolver
+{
+public:
+    static constexpr auto name = Strategy::name;
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return Strategy::number_of_arguments; }
+
+    bool isVariadic() const override { return Strategy::is_variadic; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 2}; }
+
+    bool isDeterministic() const override { return false; }
+
+    explicit FunctionDictGetDescendantsOverloadResolverImpl(ContextPtr context)
+        : dictionary_helper(std::make_shared<FunctionDictHelper>(std::move(context)))
+    {}
+
+    static FunctionOverloadResolverPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionDictGetDescendantsOverloadResolverImpl>(std::move(context));
+    }
+
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override
+    {
+        auto dictionary = dictionary_helper->getDictionary(arguments[0].column);
+        auto hierarchical_parent_to_child_index = dictionary->getHierarchicalIndex();
+
+        size_t level = Strategy::default_level;
+
+        if (arguments.size() == 3)
+        {
+            if (!arguments[2].column || !isColumnConst(*arguments[2].column))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Illegal type of third argument of function {}. Expected const unsigned integer.",
+                    getName());
+
+            auto value = static_cast<Int64>(arguments[2].column->getInt(0));
+            if (value < 0)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Illegal type of third argument of function {}. Expected const unsigned integer.",
+                    getName());
+
+            level = static_cast<size_t>(value);
+        }
+
+        DataTypes argument_types;
+        argument_types.reserve(arguments.size());
+
+        for (const auto & argument : arguments)
+            argument_types.emplace_back(argument.type);
+
+        return std::make_shared<FunctionDictGetDescendantsBase>(name, argument_types, result_type, level, hierarchical_parent_to_child_index, dictionary_helper);
+    }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         size_t arguments_size = arguments.size();
@@ -1158,47 +1231,16 @@ private:
                 arguments[2].type->getName());
         }
 
-        auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
+        auto dictionary = dictionary_helper->getDictionary(arguments[0].column);
+        const auto & hierarchical_attribute = dictionary_helper->getDictionaryHierarchicalAttribute(dictionary);
 
         return std::make_shared<DataTypeArray>(hierarchical_attribute.type);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        if (input_rows_count == 0)
-            return result_type->createColumn();
-
-        auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
-
-        size_t level = 0;
-
-        if (arguments.size() == 3)
-        {
-            if (!isColumnConst(*arguments[2].column))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Illegal type of third argument of function {}. Expected const unsigned integer.",
-                    getName());
-
-            auto value = static_cast<Int64>(arguments[2].column->getInt(0));
-            if (value < 0)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Illegal type of third argument of function {}. Expected const unsigned integer.",
-                    getName());
-
-            level = static_cast<size_t>(value);
-        }
-
-        auto key_column = ColumnWithTypeAndName{arguments[1].column->convertToFullColumnIfConst(), arguments[1].type, arguments[1].name};
-        auto key_column_casted = castColumnAccurate(key_column, hierarchical_attribute.type);
-
-        ColumnPtr result = dictionary->getDescendants(key_column_casted, hierarchical_attribute.type, level);
-
-        return result;
-    }
-
-    mutable FunctionDictHelper helper;
+    std::shared_ptr<FunctionDictHelper> dictionary_helper;
 };
 
+using FunctionDictGetDescendantsOverloadResolver = FunctionDictGetDescendantsOverloadResolverImpl<FunctionDictGetDescendantsStrategy>;
+using FunctionDictGetChildrenOverloadResolver = FunctionDictGetDescendantsOverloadResolverImpl<FunctionDictGetChildrenStrategy>;
+
 }
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index d2bcb646ecf..49546aac92b 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -123,7 +123,7 @@ public:
             bool document_ok = false;
             if (col_json_const)
             {
-                std::string_view json{reinterpret_cast<const char *>(&chars[0]), offsets[0] - 1};
+                std::string_view json{reinterpret_cast<const char *>(chars.data()), offsets[0] - 1};
                 document_ok = parser.parse(json, document);
             }
 
diff --git a/src/Functions/FunctionsMiscellaneous.h b/src/Functions/FunctionsMiscellaneous.h
index 7e8cab842c8..49da8f49c82 100644
--- a/src/Functions/FunctionsMiscellaneous.h
+++ b/src/Functions/FunctionsMiscellaneous.h
@@ -50,7 +50,11 @@ public:
          return expr_columns.getByName(signature->return_name).column;
     }
 
-bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    /// It's possible if expression_actions contains function that don't use
+    /// default implementation for Nothing.
+    /// Example: arrayMap(x -> CAST(x, 'UInt8'), []);
+    bool useDefaultImplementationForNothing() const override { return false; }
 
 private:
     ExpressionActionsPtr expression_actions;
@@ -118,6 +122,10 @@ public:
     String getName() const override { return "FunctionCapture"; }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    /// It's possible if expression_actions contains function that don't use
+    /// default implementation for Nothing and one of captured columns can be Nothing
+    /// Example: SELECT arrayMap(x -> [x, arrayElement(y, 0)], []), [] as y
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
@@ -247,6 +255,8 @@ public:
 
     String getName() const override { return name; }
     bool useDefaultImplementationForNulls() const override { return false; }
+    /// See comment in ExecutableFunctionCapture.
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName &) const override { return return_type; }
     size_t getNumberOfArguments() const override { return capture->captured_types.size(); }
diff --git a/src/Functions/GatherUtils/sliceHasImplAnyAll.h b/src/Functions/GatherUtils/sliceHasImplAnyAll.h
index 68f31006b4f..21c80b742fd 100644
--- a/src/Functions/GatherUtils/sliceHasImplAnyAll.h
+++ b/src/Functions/GatherUtils/sliceHasImplAnyAll.h
@@ -4,18 +4,11 @@
 #include "Slices.h"
 #include "sliceEqualElements.h"
 
-#if defined(__SSE4_2__)
-    #include <emmintrin.h>
-    #include <smmintrin.h>
-    #include <nmmintrin.h>
-#endif
-
-#if defined(__AVX2__)
-    #include <immintrin.h>
-#endif
-
 #include <Common/TargetSpecific.h>
 
+#if USE_MULTITARGET_CODE
+#include <immintrin.h>
+#endif
 
 namespace DB::GatherUtils
 {
@@ -67,15 +60,14 @@ inline ALWAYS_INLINE bool hasAllIntegralLoopRemainder(
     return true;
 }
 
-
-#if defined(__AVX2__)
+#if USE_MULTITARGET_CODE
 
 DECLARE_AVX2_SPECIFIC_CODE (
 
 // AVX2 Int64, UInt64 specialization
 template<typename IntType>
 requires (std::is_same_v<IntType, Int64> || std::is_same_v<IntType, UInt64>)
-inline ALWAYS_INLINE bool sliceHasImplAnyAllImplInt64(
+bool sliceHasImplAnyAllImplInt64(
     const NumericArraySlice<IntType> & first,
     const NumericArraySlice<IntType> & second,
     const UInt8 * first_null_map,
@@ -165,7 +157,7 @@ inline ALWAYS_INLINE bool sliceHasImplAnyAllImplInt64(
 // AVX2 Int32, UInt32 specialization
 template<typename IntType>
 requires (std::is_same_v<IntType, Int32> || std::is_same_v<IntType, UInt32>)
-inline ALWAYS_INLINE bool sliceHasImplAnyAllImplInt32(
+bool sliceHasImplAnyAllImplInt32(
     const NumericArraySlice<IntType> & first,
     const NumericArraySlice<IntType> & second,
     const UInt8 * first_null_map,
@@ -278,7 +270,7 @@ inline ALWAYS_INLINE bool sliceHasImplAnyAllImplInt32(
 // AVX2 Int16, UInt16 specialization
 template<typename IntType>
 requires (std::is_same_v<IntType, Int16> || std::is_same_v<IntType, UInt16>)
-inline ALWAYS_INLINE bool sliceHasImplAnyAllImplInt16(
+bool sliceHasImplAnyAllImplInt16(
     const NumericArraySlice<IntType> & first,
     const NumericArraySlice<IntType> & second,
     const UInt8 * first_null_map,
@@ -422,10 +414,6 @@ inline ALWAYS_INLINE bool sliceHasImplAnyAllImplInt16(
 
 )
 
-#endif
-
-#if defined(__SSE4_2__)
-
 DECLARE_SSE42_SPECIFIC_CODE (
 
 // SSE4.2 Int64, UInt64 specialization
@@ -895,8 +883,6 @@ inline ALWAYS_INLINE bool sliceHasImplAnyAll(const FirstSliceType & first, const
 #if USE_MULTITARGET_CODE
     if constexpr (search_type == ArraySearchType::All && std::is_same_v<FirstSliceType, SecondSliceType>)
     {
-
-#if defined(__AVX2__)
         if (isArchSupported(TargetArch::AVX2))
         {
             if constexpr (std::is_same_v<FirstSliceType, NumericArraySlice<Int16>> || std::is_same_v<FirstSliceType, NumericArraySlice<UInt16>>)
@@ -912,13 +898,12 @@ inline ALWAYS_INLINE bool sliceHasImplAnyAll(const FirstSliceType & first, const
                 return GatherUtils::TargetSpecific::AVX2::sliceHasImplAnyAllImplInt64(first, second, first_null_map, second_null_map);
             }
         }
-#endif
 
         if (isArchSupported(TargetArch::SSE42))
         {
             if constexpr (std::is_same_v<FirstSliceType, NumericArraySlice<Int8>> || std::is_same_v<FirstSliceType, NumericArraySlice<UInt8>>)
             {
-                return TargetSpecific::SSE42::sliceHasImplAnyAllImplInt8(first, second, first_null_map, second_null_map);
+                return GatherUtils::TargetSpecific::SSE42::sliceHasImplAnyAllImplInt8(first, second, first_null_map, second_null_map);
             }
             else if constexpr (std::is_same_v<FirstSliceType, NumericArraySlice<Int16>> || std::is_same_v<FirstSliceType, NumericArraySlice<UInt16>>)
             {
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 19638c78daf..171a6f55a39 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -9,6 +9,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnSparse.h>
+#include <Columns/ColumnNothing.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/Native.h>
@@ -203,6 +204,32 @@ ColumnPtr IExecutableFunction::defaultImplementationForNulls(
     return nullptr;
 }
 
+ColumnPtr IExecutableFunction::defaultImplementationForNothing(
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const
+{
+    if (!useDefaultImplementationForNothing())
+        return nullptr;
+
+    bool is_nothing_type_presented = false;
+    for (const auto & arg : args)
+        is_nothing_type_presented |= isNothing(arg.type);
+
+    if (!is_nothing_type_presented)
+        return nullptr;
+
+    if (!isNothing(result_type))
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Function {} with argument with type Nothing and default implementation for Nothing "
+            "is expected to return result with type Nothing, got {}",
+            getName(),
+            result_type->getName());
+
+    if (input_rows_count > 0)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot create non-empty column with type Nothing");
+    return ColumnNothing::create(0);
+}
+
 ColumnPtr IExecutableFunction::executeWithoutLowCardinalityColumns(
     const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
 {
@@ -212,6 +239,9 @@ ColumnPtr IExecutableFunction::executeWithoutLowCardinalityColumns(
     if (auto res = defaultImplementationForNulls(args, result_type, input_rows_count, dry_run))
         return res;
 
+    if (auto res = defaultImplementationForNothing(args, result_type, input_rows_count))
+        return res;
+
     ColumnPtr res;
     if (dry_run)
         res = executeDryRunImpl(args, result_type, input_rows_count);
@@ -250,16 +280,22 @@ ColumnPtr IExecutableFunction::executeWithoutSparseColumns(const ColumnsWithType
                                         : columns_without_low_cardinality.front().column->size();
 
             auto res = executeWithoutLowCardinalityColumns(columns_without_low_cardinality, dictionary_type, new_input_rows_count, dry_run);
-            auto keys = res->convertToFullColumnIfConst();
+            bool res_is_constant = isColumnConst(*res);
+            auto keys = res_is_constant
+                ? res->cloneResized(1)->convertToFullColumnIfConst()
+                : res;
 
             auto res_mut_dictionary = DataTypeLowCardinality::createColumnUnique(*res_low_cardinality_type->getDictionaryType());
             ColumnPtr res_indexes = res_mut_dictionary->uniqueInsertRangeFrom(*keys, 0, keys->size());
             ColumnUniquePtr res_dictionary = std::move(res_mut_dictionary);
 
-            if (indexes)
+            if (indexes && !res_is_constant)
                 result = ColumnLowCardinality::create(res_dictionary, res_indexes->index(*indexes, 0));
             else
                 result = ColumnLowCardinality::create(res_dictionary, res_indexes);
+
+            if (res_is_constant)
+                result = ColumnConst::create(std::move(result), input_rows_count);
         }
         else
         {
@@ -430,6 +466,15 @@ DataTypePtr IFunctionOverloadResolver::getReturnTypeWithoutLowCardinality(const
         }
     }
 
+    if (!arguments.empty() && useDefaultImplementationForNothing())
+    {
+        for (const auto & arg : arguments)
+        {
+            if (isNothing(arg.type))
+                return std::make_shared<DataTypeNothing>();
+        }
+    }
+
     return getReturnTypeImpl(arguments);
 }
 
diff --git a/src/Functions/IFunction.h b/src/Functions/IFunction.h
index 7b272fef53d..95af8a61aae 100644
--- a/src/Functions/IFunction.h
+++ b/src/Functions/IFunction.h
@@ -63,6 +63,11 @@ protected:
       */
     virtual bool useDefaultImplementationForNulls() const { return true; }
 
+    /** Default implementation in presence of arguments with type Nothing is the following:
+      *  If some of arguments have type Nothing then default implementation is to return constant column with type Nothing
+      */
+    virtual bool useDefaultImplementationForNothing() const { return true; }
+
     /** If the function have non-zero number of arguments,
       *  and if all arguments are constant, that we could automatically provide default implementation:
       *  arguments are converted to ordinary columns with single value, then function is executed as usual,
@@ -100,6 +105,9 @@ private:
     ColumnPtr defaultImplementationForNulls(
             const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
 
+    ColumnPtr defaultImplementationForNothing(
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const;
+
     ColumnPtr executeWithoutLowCardinalityColumns(
             const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
 
@@ -166,8 +174,8 @@ public:
     /** If function isSuitableForConstantFolding then, this method will be called during query analyzis
       * if some arguments are constants. For example logical functions (AndFunction, OrFunction) can
       * return they result based on some constant arguments.
-      * Arguments are passed without modifications, useDefaultImplementationForNulls, useDefaultImplementationForConstants,
-      * useDefaultImplementationForLowCardinality are not applied.
+      * Arguments are passed without modifications, useDefaultImplementationForNulls, useDefaultImplementationForNothing,
+      * useDefaultImplementationForConstants, useDefaultImplementationForLowCardinality are not applied.
       */
     virtual ColumnPtr getConstantResultForNonConstArguments(
         const ColumnsWithTypeAndName & /* arguments */, const DataTypePtr & /* result_type */) const { return nullptr; }
@@ -354,7 +362,13 @@ protected:
       */
     virtual bool useDefaultImplementationForNulls() const { return true; }
 
-    /** If useDefaultImplementationForNulls() is true, then change arguments for getReturnType() and build().
+    /** If useDefaultImplementationForNothing() is true, then change arguments for getReturnType() and build():
+      *  if some of arguments are Nothing then don't call getReturnType(), call build() with return_type = Nothing,
+      * Otherwise build returns build(arguments, getReturnType(arguments));
+      */
+    virtual bool useDefaultImplementationForNothing() const { return true; }
+
+    /** If useDefaultImplementationForLowCardinalityColumns() is true, then change arguments for getReturnType() and build().
       * If function arguments has low cardinality types, convert them to ordinary types.
       * getReturnType returns ColumnLowCardinality if at least one argument type is ColumnLowCardinality.
       */
@@ -403,6 +417,11 @@ public:
       */
     virtual bool useDefaultImplementationForNulls() const { return true; }
 
+    /** Default implementation in presence of arguments with type Nothing is the following:
+      *  If some of arguments have type Nothing then default implementation is to return constant column with type Nothing
+      */
+    virtual bool useDefaultImplementationForNothing() const { return true; }
+
     /** If the function have non-zero number of arguments,
       *  and if all arguments are constant, that we could automatically provide default implementation:
       *  arguments are converted to ordinary columns with single value, then function is executed as usual,
diff --git a/src/Functions/IFunctionAdaptors.h b/src/Functions/IFunctionAdaptors.h
index ec43087ad66..dfb90fd3975 100644
--- a/src/Functions/IFunctionAdaptors.h
+++ b/src/Functions/IFunctionAdaptors.h
@@ -27,6 +27,7 @@ protected:
     }
 
     bool useDefaultImplementationForNulls() const final { return function->useDefaultImplementationForNulls(); }
+    bool useDefaultImplementationForNothing() const final { return function->useDefaultImplementationForNothing(); }
     bool useDefaultImplementationForConstants() const final { return function->useDefaultImplementationForConstants(); }
     bool useDefaultImplementationForLowCardinalityColumns() const final { return function->useDefaultImplementationForLowCardinalityColumns(); }
     bool useDefaultImplementationForSparseColumns() const final { return function->useDefaultImplementationForSparseColumns(); }
@@ -124,6 +125,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override { return function->getReturnTypeImpl(arguments); }
 
     bool useDefaultImplementationForNulls() const override { return function->useDefaultImplementationForNulls(); }
+    bool useDefaultImplementationForNothing() const override { return function->useDefaultImplementationForNothing(); }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return function->useDefaultImplementationForLowCardinalityColumns(); }
     bool useDefaultImplementationForSparseColumns() const override { return function->useDefaultImplementationForSparseColumns(); }
     bool canBeExecutedOnLowCardinalityDictionary() const override { return function->canBeExecutedOnLowCardinalityDictionary(); }
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 54aaa3116fd..17bda74f8ab 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -63,14 +63,33 @@ inline bool likePatternIsSubstring(std::string_view pattern, String & res)
 
 }
 
-/** 'like'             - if true, treat pattern as SQL LIKE, otherwise as re2 regexp.
- *  'negate'           - if true, negate result
- *  'case_insensitive' - if true, match case insensitively
- *
-  * NOTE: We want to run regexp search for whole columns by one call (as implemented in function 'position')
-  *  but for that, regexp engine must support \0 bytes and their interpretation as string boundaries.
-  */
-template <typename Name, bool like, bool negate, bool case_insensitive>
+// For more readable instantiations of MatchImpl<>
+struct MatchTraits
+{
+enum class Syntax
+{
+    Like,
+    Re2
+};
+
+enum class Case
+{
+    Sensitive,
+    Insensitive
+};
+
+enum class Result
+{
+    DontNegate,
+    Negate
+};
+};
+
+/**
+ * NOTE: We want to run regexp search for whole columns by one call (as implemented in function 'position')
+ *  but for that, regexp engine must support \0 bytes and their interpretation as string boundaries.
+ */
+template <typename Name, MatchTraits::Syntax syntax_, MatchTraits::Case case_, MatchTraits::Result result_>
 struct MatchImpl
 {
     static constexpr bool use_default_implementation_for_constants = true;
@@ -81,6 +100,10 @@ struct MatchImpl
 
     using ResultType = UInt8;
 
+    static constexpr bool is_like = (syntax_ == MatchTraits::Syntax::Like);
+    static constexpr bool case_insensitive = (case_ == MatchTraits::Case::Insensitive);
+    static constexpr bool negate = (result_ == MatchTraits::Result::Negate);
+
     using Searcher = std::conditional_t<case_insensitive,
           VolnitskyCaseInsensitiveUTF8,
           VolnitskyUTF8>;
@@ -92,16 +115,20 @@ struct MatchImpl
         const ColumnPtr & start_pos_,
         PaddedPODArray<UInt8> & res)
     {
+        const size_t haystack_size = haystack_offsets.size();
+
+        if (haystack_size != res.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Function '{}' unexpectedly received a different number of haystacks and results", name);
+
         if (start_pos_ != nullptr)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Function '{}' doesn't support start_pos argument", name);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' doesn't support start_pos argument", name);
 
         if (haystack_offsets.empty())
             return;
 
         /// A simple case where the [I]LIKE expression reduces to finding a substring in a string
         String strstr_pattern;
-        if (like && impl::likePatternIsSubstring(needle, strstr_pattern))
+        if (is_like && impl::likePatternIsSubstring(needle, strstr_pattern))
         {
             const UInt8 * const begin = haystack_data.data();
             const UInt8 * const end = haystack_data.data() + haystack_data.size();
@@ -139,7 +166,7 @@ struct MatchImpl
         }
         else
         {
-            auto regexp = Regexps::get<like, true, case_insensitive>(needle);
+            auto regexp = Regexps::get<is_like, true, case_insensitive>(needle);
 
             String required_substring;
             bool is_trivial;
@@ -147,28 +174,26 @@ struct MatchImpl
 
             regexp->getAnalyzeResult(required_substring, is_trivial, required_substring_is_prefix);
 
-            size_t haystack_size = haystack_offsets.size();
-
             if (required_substring.empty())
             {
                 if (!regexp->getRE2()) /// An empty regexp. Always matches.
                 {
                     if (haystack_size)
-                        memset(res.data(), 1, haystack_size * sizeof(res[0]));
+                        memset(res.data(), !negate, haystack_size * sizeof(res[0]));
                 }
                 else
                 {
                     size_t prev_offset = 0;
                     for (size_t i = 0; i < haystack_size; ++i)
                     {
-                        res[i] = negate
-                            ^ regexp->getRE2()->Match(
-                                  {reinterpret_cast<const char *>(&haystack_data[prev_offset]), haystack_offsets[i] - prev_offset - 1},
-                                  0,
-                                  haystack_offsets[i] - prev_offset - 1,
-                                  re2_st::RE2::UNANCHORED,
-                                  nullptr,
-                                  0);
+                        const bool match = regexp->getRE2()->Match(
+                                {reinterpret_cast<const char *>(&haystack_data[prev_offset]), haystack_offsets[i] - prev_offset - 1},
+                                0,
+                                haystack_offsets[i] - prev_offset - 1,
+                                re2_st::RE2::UNANCHORED,
+                                nullptr,
+                                0);
+                        res[i] = negate ^ match;
 
                         prev_offset = haystack_offsets[i];
                     }
@@ -216,14 +241,14 @@ struct MatchImpl
                             const size_t start_pos = (required_substring_is_prefix) ? (reinterpret_cast<const char *>(pos) - str_data) : 0;
                             const size_t end_pos = str_size;
 
-                            res[i] = negate
-                                ^ regexp->getRE2()->Match(
-                                      {str_data, str_size},
-                                      start_pos,
-                                      end_pos,
-                                      re2_st::RE2::UNANCHORED,
-                                      nullptr,
-                                      0);
+                            const bool match = regexp->getRE2()->Match(
+                                    {str_data, str_size},
+                                    start_pos,
+                                    end_pos,
+                                    re2_st::RE2::UNANCHORED,
+                                    nullptr,
+                                    0);
+                            res[i] = negate ^ match;
                         }
                     }
                     else
@@ -247,12 +272,17 @@ struct MatchImpl
         const String & needle,
         PaddedPODArray<UInt8> & res)
     {
+        const size_t haystack_size = haystack.size() / N;
+
+        if (haystack_size != res.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Function '{}' unexpectedly received a different number of haystacks and results", name);
+
         if (haystack.empty())
             return;
 
         /// A simple case where the LIKE expression reduces to finding a substring in a string
         String strstr_pattern;
-        if (like && impl::likePatternIsSubstring(needle, strstr_pattern))
+        if (is_like && impl::likePatternIsSubstring(needle, strstr_pattern))
         {
             const UInt8 * const begin = haystack.data();
             const UInt8 * const end = haystack.data() + haystack.size();
@@ -295,7 +325,7 @@ struct MatchImpl
         }
         else
         {
-            auto regexp = Regexps::get<like, true, case_insensitive>(needle);
+            auto regexp = Regexps::get<is_like, true, case_insensitive>(needle);
 
             String required_substring;
             bool is_trivial;
@@ -303,28 +333,26 @@ struct MatchImpl
 
             regexp->getAnalyzeResult(required_substring, is_trivial, required_substring_is_prefix);
 
-            const size_t haystack_size = haystack.size() / N;
-
             if (required_substring.empty())
             {
                 if (!regexp->getRE2()) /// An empty regexp. Always matches.
                 {
                     if (haystack_size)
-                        memset(res.data(), 1, haystack_size * sizeof(res[0]));
+                        memset(res.data(), !negate, haystack_size * sizeof(res[0]));
                 }
                 else
                 {
                     size_t offset = 0;
                     for (size_t i = 0; i < haystack_size; ++i)
                     {
-                        res[i] = negate
-                            ^ regexp->getRE2()->Match(
-                                  {reinterpret_cast<const char *>(&haystack[offset]), N},
-                                  0,
-                                  N,
-                                  re2_st::RE2::UNANCHORED,
-                                  nullptr,
-                                  0);
+                        const bool match = regexp->getRE2()->Match(
+                                {reinterpret_cast<const char *>(&haystack[offset]), N},
+                                0,
+                                N,
+                                re2_st::RE2::UNANCHORED,
+                                nullptr,
+                                0);
+                        res[i] = negate ^ match;
 
                         offset += N;
                     }
@@ -375,14 +403,14 @@ struct MatchImpl
                                 const size_t start_pos = (required_substring_is_prefix) ? (reinterpret_cast<const char *>(pos) - str_data) : 0;
                                 const size_t end_pos = N;
 
-                                res[i] = negate
-                                    ^ regexp->getRE2()->Match(
+                                const bool match = regexp->getRE2()->Match(
                                         {str_data, N},
                                         start_pos,
                                         end_pos,
                                         re2_st::RE2::UNANCHORED,
                                         nullptr,
                                         0);
+                                res[i] = negate ^ match;
                             }
                         }
                         else
@@ -410,13 +438,11 @@ struct MatchImpl
     {
         const size_t haystack_size = haystack_offsets.size();
 
-        if (haystack_size != needle_offset.size())
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
-                    "Function '{}' unexpectedly received a different number of haystacks and needles", name);
+        if (haystack_size != needle_offset.size() || haystack_size != res.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Function '{}' unexpectedly received a different number of haystacks, needles and results", name);
 
         if (start_pos_ != nullptr)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Function '{}' doesn't support start_pos argument", name);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' doesn't support start_pos argument", name);
 
         if (haystack_offsets.empty())
             return;
@@ -440,7 +466,7 @@ struct MatchImpl
                     reinterpret_cast<const char *>(cur_needle_data),
                     cur_needle_length);
 
-            if (like && impl::likePatternIsSubstring(needle, required_substr))
+            if (is_like && impl::likePatternIsSubstring(needle, required_substr))
             {
                 if (required_substr.size() > cur_haystack_length)
                     res[i] = negate;
@@ -448,16 +474,15 @@ struct MatchImpl
                 {
                     Searcher searcher(required_substr.data(), required_substr.size(), cur_haystack_length);
                     const auto * match = searcher.search(cur_haystack_data, cur_haystack_length);
-                    res[i] = negate
-                        ^ (match != cur_haystack_data + cur_haystack_length);
+                    res[i] = negate ^ (match != cur_haystack_data + cur_haystack_length);
                 }
             }
             else
             {
                 // each row is expected to contain a different like/re2 pattern
                 // --> bypass the regexp cache, instead construct the pattern on-the-fly
-                const int flags = Regexps::buildRe2Flags<true, case_insensitive>();
-                const auto & regexp = Regexps::Regexp(Regexps::createRegexp<like>(needle, flags));
+                const int flags = Regexps::buildRe2Flags</*no_capture*/ true, case_insensitive>();
+                const auto & regexp = Regexps::Regexp(Regexps::createRegexp<is_like>(needle, flags));
 
                 regexp.getAnalyzeResult(required_substr, is_trivial, required_substring_is_prefix);
 
@@ -465,18 +490,18 @@ struct MatchImpl
                 {
                     if (!regexp.getRE2()) /// An empty regexp. Always matches.
                     {
-                        res[i] = 1;
+                        res[i] = !negate;
                     }
                     else
                     {
-                        res[i] = negate
-                            ^ regexp.getRE2()->Match(
-                                          {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
-                                          0,
-                                          cur_haystack_length,
-                                          re2_st::RE2::UNANCHORED,
-                                          nullptr,
-                                          0);
+                        const bool match = regexp.getRE2()->Match(
+                                {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
+                                0,
+                                cur_haystack_length,
+                                re2_st::RE2::UNANCHORED,
+                                nullptr,
+                                0);
+                        res[i] = negate ^ match;
                     }
                 }
                 else
@@ -499,14 +524,14 @@ struct MatchImpl
                             const size_t start_pos = (required_substring_is_prefix) ? (match - cur_haystack_data) : 0;
                             const size_t end_pos = cur_haystack_length;
 
-                            res[i] = negate
-                                ^ regexp.getRE2()->Match(
-                                              {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
-                                              start_pos,
-                                              end_pos,
-                                              re2_st::RE2::UNANCHORED,
-                                              nullptr,
-                                              0);
+                            const bool match2 = regexp.getRE2()->Match(
+                                    {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
+                                    start_pos,
+                                    end_pos,
+                                    re2_st::RE2::UNANCHORED,
+                                    nullptr,
+                                    0);
+                            res[i] = negate ^ match2;
                         }
                     }
                 }
@@ -527,13 +552,11 @@ struct MatchImpl
     {
         const size_t haystack_size = haystack.size()/N;
 
-        if (haystack_size != needle_offset.size())
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
-                    "Function '{}' unexpectedly received a different number of haystacks and needles", name);
+        if (haystack_size != needle_offset.size() || haystack_size != res.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Function '{}' unexpectedly received a different number of haystacks, needles and results", name);
 
         if (start_pos_ != nullptr)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Function '{}' doesn't support start_pos argument", name);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' doesn't support start_pos argument", name);
 
         if (haystack.empty())
             return;
@@ -557,7 +580,7 @@ struct MatchImpl
                     reinterpret_cast<const char *>(cur_needle_data),
                     cur_needle_length);
 
-            if (like && impl::likePatternIsSubstring(needle, required_substr))
+            if (is_like && impl::likePatternIsSubstring(needle, required_substr))
             {
                 if (required_substr.size() > cur_haystack_length)
                     res[i] = negate;
@@ -565,16 +588,15 @@ struct MatchImpl
                 {
                     Searcher searcher(required_substr.data(), required_substr.size(), cur_haystack_length);
                     const auto * match = searcher.search(cur_haystack_data, cur_haystack_length);
-                    res[i] = negate
-                        ^ (match != cur_haystack_data + cur_haystack_length);
+                    res[i] = negate ^ (match != cur_haystack_data + cur_haystack_length);
                 }
             }
             else
             {
                 // each row is expected to contain a different like/re2 pattern
                 // --> bypass the regexp cache, instead construct the pattern on-the-fly
-                const int flags = Regexps::buildRe2Flags<true, case_insensitive>();
-                const auto & regexp = Regexps::Regexp(Regexps::createRegexp<like>(needle, flags));
+                const int flags = Regexps::buildRe2Flags</*no_capture*/ true, case_insensitive>();
+                const auto & regexp = Regexps::Regexp(Regexps::createRegexp<is_like>(needle, flags));
 
                 regexp.getAnalyzeResult(required_substr, is_trivial, required_substring_is_prefix);
 
@@ -582,18 +604,18 @@ struct MatchImpl
                 {
                     if (!regexp.getRE2()) /// An empty regexp. Always matches.
                     {
-                        res[i] = 1;
+                        res[i] = !negate;
                     }
                     else
                     {
-                        res[i] = negate
-                            ^ regexp.getRE2()->Match(
-                                            {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
-                                            0,
-                                            cur_haystack_length,
-                                            re2_st::RE2::UNANCHORED,
-                                            nullptr,
-                                            0);
+                        const bool match = regexp.getRE2()->Match(
+                                {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
+                                0,
+                                cur_haystack_length,
+                                re2_st::RE2::UNANCHORED,
+                                nullptr,
+                                0);
+                        res[i] = negate ^ match;
                     }
                 }
                 else
@@ -616,14 +638,14 @@ struct MatchImpl
                             const size_t start_pos = (required_substring_is_prefix) ? (match - cur_haystack_data) : 0;
                             const size_t end_pos = cur_haystack_length;
 
-                            res[i] = negate
-                                ^ regexp.getRE2()->Match(
-                                        {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
-                                        start_pos,
-                                        end_pos,
-                                        re2_st::RE2::UNANCHORED,
-                                        nullptr,
-                                        0);
+                            const bool match2 = regexp.getRE2()->Match(
+                                    {reinterpret_cast<const char *>(cur_haystack_data), cur_haystack_length},
+                                    start_pos,
+                                    end_pos,
+                                    re2_st::RE2::UNANCHORED,
+                                    nullptr,
+                                    0);
+                            res[i] = negate ^ match2;
                         }
                     }
                 }
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index 595a3c8de5b..8a65c8cb2b4 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -120,7 +120,7 @@ struct MultiMatchAnyImpl
         memset(accum.data(), 0, accum.size());
         for (size_t j = 0; j < needles.size(); ++j)
         {
-            MatchImpl<Name, false, false, false>::vectorConstant(haystack_data, haystack_offsets, needles[j].toString(), nullptr, accum);
+            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, needles[j].toString(), nullptr, accum);
             for (size_t i = 0; i < res.size(); ++i)
             {
                 if constexpr (FindAny)
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index afe27c9240c..e2dbc75ab3f 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -91,7 +91,7 @@ private:
 
     static UInt16 extractPort(UInt16 default_port, const ColumnString::Chars & buf, size_t offset, size_t size)
     {
-        const char * p = reinterpret_cast<const char *>(&buf[0]) + offset;
+        const char * p = reinterpret_cast<const char *>(buf.data()) + offset;
         const char * end = p + size;
 
         StringRef host = getURLHost(p, size);
@@ -127,4 +127,3 @@ void registerFunctionPort(FunctionFactory & factory)
 }
 
 }
-
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index 58e6db86f75..0af68910b70 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -6,6 +6,7 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnFunction.h>
 #include <Columns/ColumnMap.h>
+#include <Columns/ColumnNullable.h>
 #include <Columns/IColumn.h>
 
 #include <Common/Exception.h>
@@ -16,11 +17,13 @@
 #include <DataTypes/DataTypeFunction.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypesNumber.h>
 
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 
 #include <Interpreters/Context_fwd.h>
+#include <Interpreters/castColumn.h>
 
 #include <IO/WriteHelpers.h>
 
@@ -156,7 +159,7 @@ public:
 
             DataTypePtr nested_type = data_type->getNestedType();
 
-            if (Impl::needBoolean() && !WhichDataType(nested_type).isUInt8())
+            if (Impl::needBoolean() && !isUInt8(nested_type))
                 throw Exception("The only argument for function " + getName() + " must be array of UInt8. Found "
                                 + arguments[0].type->getName() + " instead", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
@@ -180,8 +183,14 @@ public:
             /// The types of the remaining arguments are already checked in getLambdaArgumentTypes.
 
             DataTypePtr return_type = removeLowCardinality(data_type_function->getReturnType());
-            if (Impl::needBoolean() && !WhichDataType(return_type).isUInt8())
-                throw Exception("Expression for function " + getName() + " must return UInt8, found "
+
+            /// Special cases when we need boolean lambda result:
+            ///  - lambda may return Nullable(UInt8) column, in this case after lambda execution we will
+            ///    replace all NULLs with 0 and return nested UInt8 column.
+            ///  - lambda may return Nothing or Nullable(Nothing) because of default implementation of functions
+            ///    for these types. In this case we will just create UInt8 const column full of 0.
+            if (Impl::needBoolean() && !isUInt8(removeNullable(return_type)) && !isNothing(removeNullable(return_type)))
+                throw Exception("Expression for function " + getName() + " must return UInt8 or Nullable(UInt8), found "
                                 + return_type->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
             static_assert(
@@ -316,11 +325,37 @@ public:
             auto * replicated_column_function = typeid_cast<ColumnFunction *>(replicated_column_function_ptr.get());
             replicated_column_function->appendArguments(arrays);
 
-            auto lambda_result = replicated_column_function->reduce().column;
-            if (lambda_result->lowCardinality())
-                lambda_result = lambda_result->convertToFullColumnIfLowCardinality();
+            auto lambda_result = replicated_column_function->reduce();
+            if (lambda_result.column->lowCardinality())
+                lambda_result.column = lambda_result.column->convertToFullColumnIfLowCardinality();
 
-            return Impl::execute(*column_first_array, lambda_result);
+            if (Impl::needBoolean())
+            {
+                /// If result column is Nothing or Nullable(Nothing), just create const UInt8 column with 0 value.
+                if (isNothing(removeNullable(lambda_result.type)))
+                {
+                    auto result_type = std::make_shared<DataTypeUInt8>();
+                    lambda_result.column = result_type->createColumnConst(lambda_result.column->size(), 0);
+                }
+                /// If result column is Nullable(UInt8), then extract nested column and write 0 in all rows
+                /// when we have NULL.
+                else if (lambda_result.column->isNullable())
+                {
+                    auto result_column = IColumn::mutate(std::move(lambda_result.column));
+                    auto * column_nullable = assert_cast<ColumnNullable *>(result_column.get());
+                    auto & null_map = column_nullable->getNullMapData();
+                    auto nested_column = IColumn::mutate(std::move(column_nullable->getNestedColumnPtr()));
+                    auto & nested_data = assert_cast<ColumnUInt8 *>(nested_column.get())->getData();
+                    for (size_t i = 0; i != nested_data.size(); ++i)
+                    {
+                        if (null_map[i])
+                            nested_data[i] = 0;
+                    }
+                    lambda_result.column = std::move(nested_column);
+                }
+            }
+
+            return Impl::execute(*column_first_array, lambda_result.column);
         }
     }
 };
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index 72380c0a2bf..b0a7daac522 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -20,6 +20,8 @@ public:
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    /// array(..., Nothing, ...) -> Array(..., Nothing, ...)
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/array/arrayDistance.cpp b/src/Functions/array/arrayDistance.cpp
index 2ef1cab4647..3f7900b6c62 100644
--- a/src/Functions/array/arrayDistance.cpp
+++ b/src/Functions/array/arrayDistance.cpp
@@ -7,35 +7,39 @@
 #include <DataTypes/getLeastSupertype.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include "base/range.h"
+#include <base/range.h>
 
 namespace DB
 {
 namespace ErrorCodes
 {
+    extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int LOGICAL_ERROR;
     extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 struct L1Distance
 {
     static inline String name = "L1";
 
+    struct ConstParams {};
+
     template <typename FloatType>
     struct State
     {
         FloatType sum = 0;
     };
 
-    template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    static void accumulate(State<ResultType> & state, FirstArgType x, SecondArgType y)
+    template <typename ResultType>
+    static void accumulate(State<ResultType> & state, ResultType x, ResultType y, const ConstParams &)
     {
         state.sum += fabs(x - y);
     }
 
     template <typename ResultType>
-    static ResultType finalize(const State<ResultType> & state)
+    static ResultType finalize(const State<ResultType> & state, const ConstParams &)
     {
         return state.sum;
     }
@@ -45,51 +49,87 @@ struct L2Distance
 {
     static inline String name = "L2";
 
+    struct ConstParams {};
+
     template <typename FloatType>
     struct State
     {
         FloatType sum = 0;
     };
 
-    template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    static void accumulate(State<ResultType> & state, FirstArgType x, SecondArgType y)
+    template <typename ResultType>
+    static void accumulate(State<ResultType> & state, ResultType x, ResultType y, const ConstParams &)
     {
         state.sum += (x - y) * (x - y);
     }
 
     template <typename ResultType>
-    static ResultType finalize(const State<ResultType> & state)
+    static ResultType finalize(const State<ResultType> & state, const ConstParams &)
     {
         return sqrt(state.sum);
     }
 };
 
+struct LpDistance
+{
+    static inline String name = "Lp";
+
+    struct ConstParams
+    {
+        Float64 power;
+        Float64 inverted_power;
+    };
+
+    template <typename FloatType>
+    struct State
+    {
+        FloatType sum = 0;
+    };
+
+    template <typename ResultType>
+    static void accumulate(State<ResultType> & state, ResultType x, ResultType y, const ConstParams & params)
+    {
+        state.sum += std::pow(fabs(x - y), params.power);
+    }
+
+    template <typename ResultType>
+    static ResultType finalize(const State<ResultType> & state, const ConstParams & params)
+    {
+        return std::pow(state.sum, params.inverted_power);
+    }
+};
+
 struct LinfDistance
 {
     static inline String name = "Linf";
 
+    struct ConstParams {};
+
     template <typename FloatType>
     struct State
     {
         FloatType dist = 0;
     };
 
-    template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    static void accumulate(State<ResultType> & state, FirstArgType x, SecondArgType y)
+    template <typename ResultType>
+    static void accumulate(State<ResultType> & state, ResultType x, ResultType y, const ConstParams &)
     {
         state.dist = fmax(state.dist, fabs(x - y));
     }
 
     template <typename ResultType>
-    static ResultType finalize(const State<ResultType> & state)
+    static ResultType finalize(const State<ResultType> & state, const ConstParams &)
     {
         return state.dist;
     }
 };
+
 struct CosineDistance
 {
     static inline String name = "Cosine";
 
+    struct ConstParams {};
+
     template <typename FloatType>
     struct State
     {
@@ -98,8 +138,8 @@ struct CosineDistance
         FloatType y_squared = 0;
     };
 
-    template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    static void accumulate(State<ResultType> & state, FirstArgType x, SecondArgType y)
+    template <typename ResultType>
+    static void accumulate(State<ResultType> & state, ResultType x, ResultType y, const ConstParams &)
     {
         state.dot_prod += x * y;
         state.x_squared += x * x;
@@ -107,7 +147,7 @@ struct CosineDistance
     }
 
     template <typename ResultType>
-    static ResultType finalize(const State<ResultType> & state)
+    static ResultType finalize(const State<ResultType> & state, const ConstParams &)
     {
         return 1 - state.dot_prod / sqrt(state.x_squared * state.y_squared);
     }
@@ -121,17 +161,18 @@ public:
     String getName() const override { return name; }
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayDistance<Kernel>>(); }
     size_t getNumberOfArguments() const override { return 2; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {}; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         DataTypes types;
-        for (const auto & argument : arguments)
+        for (size_t i = 0; i < 2; ++i)
         {
-            const auto * array_type = checkAndGetDataType<DataTypeArray>(argument.type.get());
+            const auto * array_type = checkAndGetDataType<DataTypeArray>(arguments[i].type.get());
             if (!array_type)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument of function {} must be array.", getName());
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument {} of function {} must be array.", i, getName());
 
             types.push_back(array_type->getNestedType());
         }
@@ -145,7 +186,6 @@ public:
             case TypeIndex::Int16:
             case TypeIndex::Int32:
             case TypeIndex::Float32:
-                return std::make_shared<DataTypeFloat32>();
             case TypeIndex::UInt64:
             case TypeIndex::Int64:
             case TypeIndex::Float64:
@@ -164,14 +204,11 @@ public:
     {
         switch (result_type->getTypeId())
         {
-            case TypeIndex::Float32:
-                return executeWithResultType<Float32>(arguments, input_rows_count);
-                break;
             case TypeIndex::Float64:
                 return executeWithResultType<Float64>(arguments, input_rows_count);
                 break;
             default:
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected result type.");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected result type {}", result_type->getName());
         }
     }
 
@@ -225,7 +262,7 @@ private:
         {
         #define ON_TYPE(type) \
             case TypeIndex::type: \
-                return executeWithTypes<ResultType, FirstArgType, type>(arguments[0].column, arguments[1].column, input_rows_count); \
+                return executeWithTypes<ResultType, FirstArgType, type>(arguments[0].column, arguments[1].column, input_rows_count, arguments); \
                 break;
 
             SUPPORTED_TYPES(ON_TYPE)
@@ -241,15 +278,15 @@ private:
     }
 
     template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    ColumnPtr executeWithTypes(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count) const
+    ColumnPtr executeWithTypes(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
     {
         if (typeid_cast<const ColumnConst *>(col_x.get()))
         {
-            return executeWithTypesFirstArgConst<ResultType, FirstArgType, SecondArgType>(col_x, col_y, input_rows_count);
+            return executeWithTypesFirstArgConst<ResultType, FirstArgType, SecondArgType>(col_x, col_y, input_rows_count, arguments);
         }
         else if (typeid_cast<const ColumnConst *>(col_y.get()))
         {
-            return executeWithTypesFirstArgConst<ResultType, SecondArgType, FirstArgType>(col_y, col_x, input_rows_count);
+            return executeWithTypesFirstArgConst<ResultType, SecondArgType, FirstArgType>(col_y, col_x, input_rows_count, arguments);
         }
 
         col_x = col_x->convertToFullColumnIfConst();
@@ -277,6 +314,8 @@ private:
             }
         }
 
+        const typename Kernel::ConstParams kernel_params = initConstParams(arguments);
+
         auto result = ColumnVector<ResultType>::create(input_rows_count);
         auto & result_data = result->getData();
 
@@ -288,9 +327,9 @@ private:
             typename Kernel::template State<Float64> state;
             for (; prev < off; ++prev)
             {
-                Kernel::accumulate(state, data_x[prev], data_y[prev]);
+                Kernel::template accumulate<Float64>(state, data_x[prev], data_y[prev], kernel_params);
             }
-            result_data[row] = Kernel::finalize(state);
+            result_data[row] = Kernel::finalize(state, kernel_params);
             row++;
         }
         return result;
@@ -298,7 +337,7 @@ private:
 
     /// Special case when the 1st parameter is Const
     template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    ColumnPtr executeWithTypesFirstArgConst(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count) const
+    ColumnPtr executeWithTypesFirstArgConst(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
     {
         col_x = assert_cast<const ColumnConst *>(col_x.get())->getDataColumnPtr();
         col_y = col_y->convertToFullColumnIfConst();
@@ -326,6 +365,8 @@ private:
             prev_offset = offsets_y[row];
         }
 
+        const typename Kernel::ConstParams kernel_params = initConstParams(arguments);
+
         auto result = ColumnVector<ResultType>::create(input_rows_count);
         auto & result_data = result->getData();
 
@@ -337,22 +378,60 @@ private:
             typename Kernel::template State<Float64> state;
             for (size_t i = 0; prev < off; ++i, ++prev)
             {
-                Kernel::accumulate(state, data_x[i], data_y[prev]);
+                Kernel::template accumulate<Float64>(state, data_x[i], data_y[prev], kernel_params);
             }
-            result_data[row] = Kernel::finalize(state);
+            result_data[row] = Kernel::finalize(state, kernel_params);
             row++;
         }
         return result;
     }
 
+    typename Kernel::ConstParams initConstParams(const ColumnsWithTypeAndName &) const { return {}; }
 };
 
-void registerFunctionArrayDistance(FunctionFactory & factory)
+
+template <>
+size_t FunctionArrayDistance<LpDistance>::getNumberOfArguments() const { return 3; }
+
+template <>
+ColumnNumbers FunctionArrayDistance<LpDistance>::getArgumentsThatAreAlwaysConstant() const { return {2}; }
+
+template <>
+LpDistance::ConstParams FunctionArrayDistance<LpDistance>::initConstParams(const ColumnsWithTypeAndName & arguments) const
 {
-    factory.registerFunction<FunctionArrayDistance<L1Distance>>();
-    factory.registerFunction<FunctionArrayDistance<L2Distance>>();
-    factory.registerFunction<FunctionArrayDistance<LinfDistance>>();
-    factory.registerFunction<FunctionArrayDistance<CosineDistance>>();
+    if (arguments.size() < 3)
+        throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Argument p of function {} was not provided",
+                    getName());
+
+    if (!arguments[2].column->isNumeric())
+        throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Argument p of function {} must be numeric constant",
+                    getName());
+
+    if (!isColumnConst(*arguments[2].column) && arguments[2].column->size() != 1)
+        throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Second argument for function {} must be either constant Float64 or constant UInt",
+                    getName());
+
+    Float64 p = arguments[2].column->getFloat64(0);
+    if (p < 1 || p >= HUGE_VAL)
+        throw Exception(
+                    ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                    "Second argument for function {} must be not less than one and not be an infinity",
+                    getName());
+
+    return LpDistance::ConstParams{p, 1 / p};
 }
 
+/// These functions are used by TupleOrArrayFunction
+FunctionPtr createFunctionArrayL1Distance(ContextPtr context_) { return FunctionArrayDistance<L1Distance>::create(context_); }
+FunctionPtr createFunctionArrayL2Distance(ContextPtr context_) { return FunctionArrayDistance<L2Distance>::create(context_); }
+FunctionPtr createFunctionArrayLpDistance(ContextPtr context_) { return FunctionArrayDistance<LpDistance>::create(context_); }
+FunctionPtr createFunctionArrayLinfDistance(ContextPtr context_) { return FunctionArrayDistance<LinfDistance>::create(context_); }
+FunctionPtr createFunctionArrayCosineDistance(ContextPtr context_) { return FunctionArrayDistance<CosineDistance>::create(context_); }
+
 }
diff --git a/src/Functions/array/arrayNorm.cpp b/src/Functions/array/arrayNorm.cpp
index 587c65a49ca..2142abc4c90 100644
--- a/src/Functions/array/arrayNorm.cpp
+++ b/src/Functions/array/arrayNorm.cpp
@@ -13,22 +13,26 @@ namespace DB
 {
 namespace ErrorCodes
 {
+    extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int LOGICAL_ERROR;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 struct L1Norm
 {
     static inline String name = "L1";
 
-    template <typename ResultType, typename ArgumentType>
-    inline static ResultType accumulate(ResultType result, ArgumentType value)
+    struct ConstParams {};
+
+    template <typename ResultType>
+    inline static ResultType accumulate(ResultType result, ResultType value, const ConstParams &)
     {
         return result + fabs(value);
     }
 
     template <typename ResultType>
-    inline static ResultType finalize(ResultType result)
+    inline static ResultType finalize(ResultType result, const ConstParams &)
     {
         return result;
     }
@@ -38,32 +42,59 @@ struct L2Norm
 {
     static inline String name = "L2";
 
-    template <typename ResultType, typename ArgumentType>
-    inline static ResultType accumulate(ResultType result, ArgumentType value)
+    struct ConstParams {};
+
+    template <typename ResultType>
+    inline static ResultType accumulate(ResultType result, ResultType value, const ConstParams &)
     {
         return result + value * value;
     }
 
     template <typename ResultType>
-    inline static ResultType finalize(ResultType result)
+    inline static ResultType finalize(ResultType result, const ConstParams &)
     {
         return sqrt(result);
     }
 };
 
 
+struct LpNorm
+{
+    static inline String name = "Lp";
+
+    struct ConstParams
+    {
+        Float64 power;
+        Float64 inverted_power = 1 / power;
+    };
+
+    template <typename ResultType>
+    inline static ResultType accumulate(ResultType result, ResultType value, const ConstParams & params)
+    {
+        return result + std::pow(fabs(value), params.power);
+    }
+
+    template <typename ResultType>
+    inline static ResultType finalize(ResultType result, const ConstParams & params)
+    {
+        return std::pow(result, params.inverted_power);
+    }
+};
+
 struct LinfNorm
 {
     static inline String name = "Linf";
 
-    template <typename ResultType, typename ArgumentType>
-    inline static ResultType accumulate(ResultType result, ArgumentType value)
+    struct ConstParams {};
+
+    template <typename ResultType>
+    inline static ResultType accumulate(ResultType result, ResultType value, const ConstParams &)
     {
         return fmax(result, fabs(value));
     }
 
     template <typename ResultType>
-    inline static ResultType finalize(ResultType result)
+    inline static ResultType finalize(ResultType result, const ConstParams &)
     {
         return result;
     }
@@ -78,22 +109,17 @@ public:
     String getName() const override { return name; }
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayNorm<Kernel>>(); }
     size_t getNumberOfArguments() const override { return 1; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {}; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        DataTypes types;
-        for (const auto & argument : arguments)
-        {
-            const auto * array_type = checkAndGetDataType<DataTypeArray>(argument.type.get());
-            if (!array_type)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument of function {} must be array.", getName());
+        const auto * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].type.get());
+        if (!array_type)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument of function {} must be array.", getName());
 
-            types.push_back(array_type->getNestedType());
-        }
-        const auto & common_type = getLeastSupertype(types);
-        switch (common_type->getTypeId())
+        switch (array_type->getNestedType()->getTypeId())
         {
             case TypeIndex::UInt8:
             case TypeIndex::UInt16:
@@ -102,7 +128,6 @@ public:
             case TypeIndex::Int16:
             case TypeIndex::Int32:
             case TypeIndex::Float32:
-                return std::make_shared<DataTypeFloat32>();
             case TypeIndex::UInt64:
             case TypeIndex::Int64:
             case TypeIndex::Float64:
@@ -112,7 +137,7 @@ public:
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Arguments of function {} has nested type {}. "
                     "Support: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
-                    getName(), common_type->getName());
+                    getName(), array_type->getNestedType()->getName());
         }
     }
 
@@ -125,14 +150,11 @@ public:
 
         switch (result_type->getTypeId())
         {
-            case TypeIndex::Float32:
-                return executeWithResultType<Float32>(*arr, type, input_rows_count);
-                break;
             case TypeIndex::Float64:
-                return executeWithResultType<Float64>(*arr, type, input_rows_count);
+                return executeWithResultType<Float64>(*arr, type, input_rows_count, arguments);
                 break;
             default:
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected result type.");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected result type {}", result_type->getName());
         }
     }
 
@@ -152,13 +174,13 @@ private:
 
 
     template <typename ResultType>
-    ColumnPtr executeWithResultType(const ColumnArray & array, const DataTypePtr & nested_type, size_t input_rows_count) const
+    ColumnPtr executeWithResultType(const ColumnArray & array, const DataTypePtr & nested_type, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
     {
         switch (nested_type->getTypeId())
         {
         #define ON_TYPE(type) \
             case TypeIndex::type: \
-                return executeWithTypes<ResultType, type>(array, input_rows_count); \
+                return executeWithTypes<ResultType, type>(array, input_rows_count, arguments); \
                 break;
 
             SUPPORTED_TYPES(ON_TYPE)
@@ -174,7 +196,7 @@ private:
     }
 
     template <typename ResultType, typename ArgumentType>
-    static ColumnPtr executeWithTypes(const ColumnArray & array, size_t input_rows_count)
+    ColumnPtr executeWithTypes(const ColumnArray & array, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
     {
         const auto & data = typeid_cast<const ColumnVector<ArgumentType> &>(array.getData()).getData();
         const auto & offsets = array.getOffsets();
@@ -182,6 +204,8 @@ private:
         auto result_col = ColumnVector<ResultType>::create(input_rows_count);
         auto & result_data = result_col->getData();
 
+        const typename Kernel::ConstParams kernel_params = initConstParams(arguments);
+
         ColumnArray::Offset prev = 0;
         size_t row = 0;
         for (auto off : offsets)
@@ -189,20 +213,59 @@ private:
             Float64 result = 0;
             for (; prev < off; ++prev)
             {
-                result = Kernel::accumulate(result, data[prev]);
+                result = Kernel::template accumulate<Float64>(result, data[prev], kernel_params);
             }
-            result_data[row] = Kernel::finalize(result);
+            result_data[row] = Kernel::finalize(result, kernel_params);
             row++;
         }
         return result_col;
     }
+
+    typename Kernel::ConstParams initConstParams(const ColumnsWithTypeAndName &) const { return {}; }
 };
 
-void registerFunctionArrayNorm(FunctionFactory & factory)
+template <>
+size_t FunctionArrayNorm<LpNorm>::getNumberOfArguments() const { return 2; }
+
+template <>
+ColumnNumbers FunctionArrayNorm<LpNorm>::getArgumentsThatAreAlwaysConstant() const { return {1}; }
+
+template <>
+LpNorm::ConstParams FunctionArrayNorm<LpNorm>::initConstParams(const ColumnsWithTypeAndName & arguments) const
 {
-    factory.registerFunction<FunctionArrayNorm<L1Norm>>();
-    factory.registerFunction<FunctionArrayNorm<L2Norm>>();
-    factory.registerFunction<FunctionArrayNorm<LinfNorm>>();
+    if (arguments.size() < 2)
+        throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Argument p of function {} was not provided",
+                    getName());
+
+    if (!arguments[1].column->isNumeric())
+        throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Argument p of function {} must be numeric constant",
+                    getName());
+
+    if (!isColumnConst(*arguments[1].column) && arguments[1].column->size() != 1)
+        throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Second argument for function {} must be either constant Float64 or constant UInt",
+                    getName());
+
+    Float64 p = arguments[1].column->getFloat64(0);
+    if (p < 1 || p >= HUGE_VAL)
+        throw Exception(
+                    ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                    "Second argument for function {} must be not less than one and not be an infinity",
+                    getName());
+
+    return LpNorm::ConstParams{p, 1 / p};
 }
 
+
+/// These functions are used by TupleOrArrayFunction
+FunctionPtr createFunctionArrayL1Norm(ContextPtr context_) { return FunctionArrayNorm<L1Norm>::create(context_); }
+FunctionPtr createFunctionArrayL2Norm(ContextPtr context_) { return FunctionArrayNorm<L2Norm>::create(context_); }
+FunctionPtr createFunctionArrayLpNorm(ContextPtr context_) { return FunctionArrayNorm<LpNorm>::create(context_); }
+FunctionPtr createFunctionArrayLinfNorm(ContextPtr context_) { return FunctionArrayNorm<LinfNorm>::create(context_); }
+
 }
diff --git a/src/Functions/array/registerFunctionsArray.cpp b/src/Functions/array/registerFunctionsArray.cpp
index e2e8b08fbf2..3bb27cbadf9 100644
--- a/src/Functions/array/registerFunctionsArray.cpp
+++ b/src/Functions/array/registerFunctionsArray.cpp
@@ -37,8 +37,6 @@ void registerFunctionArrayAUC(FunctionFactory &);
 void registerFunctionArrayReduceInRanges(FunctionFactory &);
 void registerFunctionMapOp(FunctionFactory &);
 void registerFunctionMapPopulateSeries(FunctionFactory &);
-void registerFunctionArrayDistance(FunctionFactory &);
-void registerFunctionArrayNorm(FunctionFactory &);
 
 void registerFunctionsArray(FunctionFactory & factory)
 {
@@ -77,8 +75,6 @@ void registerFunctionsArray(FunctionFactory & factory)
     registerFunctionArrayAUC(factory);
     registerFunctionMapOp(factory);
     registerFunctionMapPopulateSeries(factory);
-    registerFunctionArrayDistance(factory);
-    registerFunctionArrayNorm(factory);
 }
 
 }
diff --git a/src/Functions/assumeNotNull.cpp b/src/Functions/assumeNotNull.cpp
index b180931a83a..8f999af9ef0 100644
--- a/src/Functions/assumeNotNull.cpp
+++ b/src/Functions/assumeNotNull.cpp
@@ -7,6 +7,12 @@
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+}
+
 namespace
 {
 
@@ -45,6 +51,9 @@ public:
     {
         const ColumnPtr & col = arguments[0].column;
 
+        if (arguments[0].type->onlyNull() && !col->empty())
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot create non-empty column with type Nothing");
+
         if (const auto * nullable_col = checkAndGetColumn<ColumnNullable>(*col))
             return nullable_col->getNestedColumnPtr();
         else
diff --git a/src/Functions/castOrDefault.cpp b/src/Functions/castOrDefault.cpp
index f7b93ec2e83..2e9f13545fd 100644
--- a/src/Functions/castOrDefault.cpp
+++ b/src/Functions/castOrDefault.cpp
@@ -52,6 +52,7 @@ public:
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return true; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
@@ -194,6 +195,7 @@ private:
     bool isVariadic() const override { return true; }
 
     bool useDefaultImplementationForNulls() const override { return impl.useDefaultImplementationForNulls(); }
+    bool useDefaultImplementationForNothing() const override { return impl.useDefaultImplementationForNothing(); }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return impl.useDefaultImplementationForLowCardinalityColumns();}
     bool useDefaultImplementationForConstants() const override { return impl.useDefaultImplementationForConstants();}
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index 96aa110a489..b2b234df515 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -112,7 +112,6 @@ public:
 
         auto is_not_null = FunctionFactory::instance().get("isNotNull", context);
         auto assume_not_null = FunctionFactory::instance().get("assumeNotNull", context);
-        auto multi_if = FunctionFactory::instance().get("multiIf", context);
 
         ColumnsWithTypeAndName multi_if_args;
         ColumnsWithTypeAndName tmp_args(1);
@@ -144,7 +143,16 @@ public:
         if (multi_if_args.size() == 1)
             return multi_if_args.front().column;
 
-        ColumnPtr res = multi_if->build(multi_if_args)->execute(multi_if_args, result_type, input_rows_count);
+        /// If there was only two arguments (3 arguments passed to multiIf)
+        /// use function "if" instead, because it's implemented more efficient.
+        /// TODO: make "multiIf" the same efficient.
+        FunctionOverloadResolverPtr if_function;
+        if (multi_if_args.size() == 3)
+            if_function = FunctionFactory::instance().get("if", context);
+        else
+            if_function = FunctionFactory::instance().get("multiIf", context);
+
+        ColumnPtr res = if_function->build(multi_if_args)->execute(multi_if_args, result_type, input_rows_count);
 
         /// if last argument is not nullable, result should be also not nullable
         if (!multi_if_args.back().column->isNullable() && res->isNullable())
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index 9b0d2625914..ab8b37af960 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -7,6 +7,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/PerformanceAdaptors.h>
+#include <Interpreters/castColumn.h>
 #include <Common/TargetSpecific.h>
 #include <base/range.h>
 #include <cmath>
@@ -14,9 +15,11 @@
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
 }
 
 /** Calculates the distance between two geographical locations.
@@ -262,24 +265,48 @@ private:
         return std::make_shared<DataTypeFloat32>();
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         auto dst = ColumnVector<Float32>::create();
         auto & dst_data = dst->getData();
         dst_data.resize(input_rows_count);
 
-        const IColumn & col_lon1 = *arguments[0].column;
-        const IColumn & col_lat1 = *arguments[1].column;
-        const IColumn & col_lon2 = *arguments[2].column;
-        const IColumn & col_lat2 = *arguments[3].column;
+        auto arguments_copy = arguments;
+        for (auto & argument : arguments_copy)
+        {
+            argument.column = argument.column->convertToFullColumnIfConst();
+            argument.column = castColumn(argument, result_type);
+            argument.type = result_type;
+        }
+
+        const auto * col_lon1 = convertArgumentColumnToFloat32(arguments_copy, 0);
+        const auto * col_lat1 = convertArgumentColumnToFloat32(arguments_copy, 1);
+        const auto * col_lon2 = convertArgumentColumnToFloat32(arguments_copy, 2);
+        const auto * col_lat2 = convertArgumentColumnToFloat32(arguments_copy, 3);
 
         for (size_t row_num = 0; row_num < input_rows_count; ++row_num)
+        {
             dst_data[row_num] = distance<method>(
-                col_lon1.getFloat32(row_num), col_lat1.getFloat32(row_num),
-                col_lon2.getFloat32(row_num), col_lat2.getFloat32(row_num));
+                col_lon1->getData()[row_num], col_lat1->getData()[row_num],
+                col_lon2->getData()[row_num], col_lat2->getData()[row_num]);
+        }
 
         return dst;
     }
+
+    const ColumnFloat32 * convertArgumentColumnToFloat32(const ColumnsWithTypeAndName & arguments, size_t argument_index) const
+    {
+        const auto * column_typed = checkAndGetColumn<ColumnFloat32>(arguments[argument_index].column.get());
+        if (!column_typed)
+            throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal type {} of argument {} of function {}. Must be Float32.",
+                    arguments[argument_index].type->getName(),
+                    argument_index + 1,
+                    getName());
+
+        return column_typed;
+    }
 };
 
 ) // DECLARE_MULTITARGET_CODE
diff --git a/src/Functions/grouping.h b/src/Functions/grouping.h
new file mode 100644
index 00000000000..a49e946b2cb
--- /dev/null
+++ b/src/Functions/grouping.h
@@ -0,0 +1,165 @@
+#pragma once
+
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Core/ColumnNumbers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+
+namespace DB
+{
+
+class FunctionGroupingBase : public IFunction
+{
+protected:
+    static constexpr UInt64 ONE = 1;
+
+    const ColumnNumbers arguments_indexes;
+
+public:
+    FunctionGroupingBase(ColumnNumbers arguments_indexes_)
+        : arguments_indexes(std::move(arguments_indexes_))
+    {}
+
+    bool isVariadic() const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    bool isSuitableForConstantFolding() const override { return false; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    template <typename AggregationKeyChecker>
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, size_t input_rows_count, AggregationKeyChecker checker) const
+    {
+        const auto * grouping_set_column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+
+        auto result = ColumnUInt64::create();
+        auto & result_data = result->getData();
+        result_data.reserve(input_rows_count);
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            UInt64 set_index = grouping_set_column->getElement(i);
+
+            UInt64 value = 0;
+            for (auto index : arguments_indexes)
+                value = (value << 1) + (checker(set_index, index) ? 1 : 0);
+
+            result_data.push_back(value);
+        }
+        return result;
+    }
+};
+
+class FunctionGroupingOrdinary : public FunctionGroupingBase
+{
+public:
+    explicit FunctionGroupingOrdinary(ColumnNumbers arguments_indexes_)
+        : FunctionGroupingBase(std::move(arguments_indexes_))
+    {}
+
+    String getName() const override { return "groupingOrdinary"; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        UInt64 value = (ONE << arguments_indexes.size()) - 1;
+        return ColumnUInt64::create(input_rows_count, value);
+    }
+};
+
+class FunctionGroupingForRollup : public FunctionGroupingBase
+{
+    const UInt64 aggregation_keys_number;
+
+public:
+    FunctionGroupingForRollup(ColumnNumbers arguments_indexes_, UInt64 aggregation_keys_number_)
+        : FunctionGroupingBase(std::move(arguments_indexes_))
+        , aggregation_keys_number(aggregation_keys_number_)
+    {}
+
+    String getName() const override { return "groupingForRollup"; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return FunctionGroupingBase::executeImpl(arguments, input_rows_count,
+            [this](UInt64 set_index, UInt64 arg_index)
+            {
+                // For ROLLUP(a, b, c) there will be following grouping set indexes:
+                // | GROUPING SET | INDEX |
+                // | (a, b, c)    |   0   |
+                // | (a, b)       |   1   |
+                // | (a)          |   2   |
+                // | ()           |   3   |
+                return arg_index < aggregation_keys_number - set_index;
+            }
+        );
+    }
+};
+
+class FunctionGroupingForCube : public FunctionGroupingBase
+{
+    const UInt64 aggregation_keys_number;
+
+public:
+
+    FunctionGroupingForCube(ColumnNumbers arguments_indexes_, UInt64 aggregation_keys_number_)
+        : FunctionGroupingBase(arguments_indexes_)
+        , aggregation_keys_number(aggregation_keys_number_)
+    {}
+
+    String getName() const override { return "groupingForCube"; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return FunctionGroupingBase::executeImpl(arguments, input_rows_count,
+            [this](UInt64 set_index, UInt64 arg_index)
+            {
+                // For CUBE(a, b) there will be following grouping set indexes:
+                // | GROUPING SET | INDEX |
+                // | (a, b)       |   0   |
+                // | (a)          |   1   |
+                // | (b)          |   2   |
+                // | ()           |   3   |
+                auto set_mask = (ONE << aggregation_keys_number) - 1 - set_index;
+                return set_mask & (ONE << (aggregation_keys_number - arg_index - 1));
+            }
+        );
+    }
+};
+
+class FunctionGroupingForGroupingSets : public FunctionGroupingBase
+{
+    ColumnNumbersSetList grouping_sets;
+public:
+    FunctionGroupingForGroupingSets(ColumnNumbers arguments_indexes_, ColumnNumbersList const & grouping_sets_)
+        : FunctionGroupingBase(std::move(arguments_indexes_))
+    {
+        for (auto const & set : grouping_sets_)
+            grouping_sets.emplace_back(set.begin(), set.end());
+    }
+
+    String getName() const override { return "groupingForGroupingSets"; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return FunctionGroupingBase::executeImpl(arguments, input_rows_count,
+            [this](UInt64 set_index, UInt64 arg_index)
+            {
+                return grouping_sets[set_index].contains(arg_index);
+            }
+        );
+    }
+};
+
+}
diff --git a/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp b/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp
new file mode 100644
index 00000000000..4a4a36076b2
--- /dev/null
+++ b/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp
@@ -0,0 +1,95 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <base/range.h>
+#include <constants.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3GetDestinationIndexFromUnidirectionalEdge : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetDestinationIndexFromUnidirectionalEdge";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetDestinationIndexFromUnidirectionalEdge>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_edge = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_edge)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_edge = col_hindex_edge->getData();
+
+        auto dst = ColumnVector<UInt64>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const UInt64 edge = data_hindex_edge[row];
+            const UInt64 res = getDirectedEdgeDestination(edge);
+            dst_data[row] = res;
+        }
+
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3GetDestinationIndexFromUnidirectionalEdge(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetDestinationIndexFromUnidirectionalEdge>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp b/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp
new file mode 100644
index 00000000000..91ab22aed29
--- /dev/null
+++ b/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp
@@ -0,0 +1,110 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3GetIndexesFromUnidirectionalEdge : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetIndexesFromUnidirectionalEdge";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetIndexesFromUnidirectionalEdge>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeTuple>(
+                DataTypes{std::make_shared<DataTypeUInt64>(), std::make_shared<DataTypeUInt64>()},
+                Strings{"origin", "destination"});
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_edge = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_edge)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_edge = col_hindex_edge->getData();
+
+        auto origin = ColumnUInt64::create(input_rows_count);
+        auto destination = ColumnUInt64::create(input_rows_count);
+
+        ColumnUInt64::Container & origin_data = origin->getData();
+        ColumnUInt64::Container & destination_data = destination->getData();
+
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const UInt64 edge = data_hindex_edge[row];
+            // allocate array of size 2
+            // directedEdgeToCells func sets the origin and
+            // destination at [0] and [1] of the input vector
+            std::array<H3Index, 2> res;
+
+            directedEdgeToCells(edge, res.data());
+
+            origin_data[row] = res[0];
+            destination_data[row] = res[1];
+        }
+
+        MutableColumns columns;
+        columns.emplace_back(std::move(origin));
+        columns.emplace_back(std::move(destination));
+
+        return ColumnTuple::create(std::move(columns));
+    }
+};
+
+}
+
+void registerFunctionH3GetIndexesFromUnidirectionalEdge(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetIndexesFromUnidirectionalEdge>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp b/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp
new file mode 100644
index 00000000000..acf94fcf95f
--- /dev/null
+++ b/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp
@@ -0,0 +1,95 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <base/range.h>
+#include <constants.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3GetOriginIndexFromUnidirectionalEdge : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetOriginIndexFromUnidirectionalEdge";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetOriginIndexFromUnidirectionalEdge>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_edge = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_edge)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_edge = col_hindex_edge->getData();
+
+        auto dst = ColumnVector<UInt64>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const UInt64 edge = data_hindex_edge[row];
+            const UInt64 res = getDirectedEdgeOrigin(edge);
+            dst_data[row] = res;
+        }
+
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3GetOriginIndexFromUnidirectionalEdge(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetOriginIndexFromUnidirectionalEdge>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3GetUnidirectionalEdge.cpp b/src/Functions/h3GetUnidirectionalEdge.cpp
new file mode 100644
index 00000000000..7d4122150e6
--- /dev/null
+++ b/src/Functions/h3GetUnidirectionalEdge.cpp
@@ -0,0 +1,127 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3GetUnidirectionalEdge : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetUnidirectionalEdge";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetUnidirectionalEdge>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        arg = arguments[1].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 2, getName());
+
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_origin = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_origin)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_origin = col_hindex_origin->getData();
+
+        const auto * col_hindex_dest = checkAndGetColumn<ColumnUInt64>(non_const_arguments[1].column.get());
+        if (!col_hindex_dest)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[1].type->getName(),
+                2,
+                getName());
+
+        const auto & data_hindex_dest = col_hindex_dest->getData();
+
+        auto dst = ColumnVector<UInt64>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const UInt64 origin = data_hindex_origin[row];
+            const UInt64 dest = data_hindex_dest[row];
+
+            if (!isValidCell(origin))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Invalid origin H3 index: {}", origin);
+            if (!isValidCell(dest))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Invalid dest H3 index: {}", dest);
+
+            UInt64 res = getUnidirectionalEdge(origin, dest);
+            dst_data[row] = res;
+        }
+
+        return dst;
+    }
+
+    /// suppress asan errors generated by the following:
+    /// 'NEW_ADJUSTMENT_III' defined in '../contrib/h3/src/h3lib/lib/algos.c:142:24
+    /// 'NEW_DIGIT_III' defined in '../contrib/h3/src/h3lib/lib/algos.c:121:24
+    __attribute__((no_sanitize_address)) static inline UInt64 getUnidirectionalEdge(const UInt64 origin, const UInt64 dest)
+    {
+        const UInt64 res = cellsToDirectedEdge(origin, dest);
+        return res;
+    }
+};
+
+}
+
+void registerFunctionH3GetUnidirectionalEdge(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetUnidirectionalEdge>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp b/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp
new file mode 100644
index 00000000000..4cbdda2cb70
--- /dev/null
+++ b/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp
@@ -0,0 +1,111 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3GetUnidirectionalEdgeBoundary : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetUnidirectionalEdgeBoundary";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetUnidirectionalEdgeBoundary>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeArray>(
+            std::make_shared<DataTypeTuple>(
+                DataTypes{std::make_shared<DataTypeFloat64>(), std::make_shared<DataTypeFloat64>()}));
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_edge = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_edge)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_edge = col_hindex_edge->getData();
+
+        auto latitude = ColumnFloat64::create();
+        auto longitude = ColumnFloat64::create();
+        auto offsets = DataTypeNumber<IColumn::Offset>().createColumn();
+        offsets->reserve(input_rows_count);
+        IColumn::Offset current_offset = 0;
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            H3Index edge = data_hindex_edge[row];
+            CellBoundary boundary{};
+
+            directedEdgeToBoundary(edge, &boundary);
+
+            for (int vert = 0; vert < boundary.numVerts; ++vert)
+            {
+                latitude->getData().push_back(radsToDegs(boundary.verts[vert].lat));
+                longitude->getData().push_back(radsToDegs(boundary.verts[vert].lng));
+            }
+
+            current_offset += boundary.numVerts;
+            offsets->insert(current_offset);
+        }
+
+        return ColumnArray::create(
+            ColumnTuple::create(Columns{std::move(latitude), std::move(longitude)}),
+            std::move(offsets));
+    }
+};
+
+}
+
+void registerFunctionH3GetUnidirectionalEdgeBoundary(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetUnidirectionalEdgeBoundary>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp b/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp
new file mode 100644
index 00000000000..10e0a5d8cb2
--- /dev/null
+++ b/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp
@@ -0,0 +1,112 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3GetUnidirectionalEdgesFromHexagon : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetUnidirectionalEdgesFromHexagon";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetUnidirectionalEdgesFromHexagon>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_edge = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_edge)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_edge = col_hindex_edge->getData();
+
+        auto result_column_data = ColumnUInt64::create();
+        auto & result_data = result_column_data->getData();
+
+        auto result_column_offsets = ColumnArray::ColumnOffsets::create();
+        auto & result_offsets = result_column_offsets->getData();
+        result_offsets.resize(input_rows_count);
+
+        auto current_offset = 0;
+        result_data.reserve(input_rows_count);
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            // allocate array of size 6
+            // originToDirectedEdges places 6 edges into
+            // array that's passed to it
+            std::array<H3Index, 6> res;
+
+            const UInt64 edge = data_hindex_edge[row];
+            originToDirectedEdges(edge, res.data());
+
+            for (auto & i : res)
+            {
+                ++current_offset;
+                result_data.emplace_back(i);
+            }
+
+            result_offsets[row] = current_offset;
+        }
+        return ColumnArray::create(std::move(result_column_data), std::move(result_column_offsets));
+    }
+};
+
+}
+
+void registerFunctionH3GetUnidirectionalEdgesFromHexagon(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetUnidirectionalEdgesFromHexagon>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3UnidirectionalEdgeIsValid.cpp b/src/Functions/h3UnidirectionalEdgeIsValid.cpp
new file mode 100644
index 00000000000..6b00fba3c5a
--- /dev/null
+++ b/src/Functions/h3UnidirectionalEdgeIsValid.cpp
@@ -0,0 +1,97 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <base/range.h>
+#include <constants.h>
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+}
+
+namespace
+{
+
+class FunctionH3UnidirectionalEdgeIsValid : public IFunction
+{
+public:
+    static constexpr auto name = "h3UnidirectionalEdgeIsValid";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3UnidirectionalEdgeIsValid>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(),
+                1,
+                getName());
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto non_const_arguments = arguments;
+        for (auto & argument : non_const_arguments)
+            argument.column = argument.column->convertToFullColumnIfConst();
+
+        const auto * col_hindex_edge = checkAndGetColumn<ColumnUInt64>(non_const_arguments[0].column.get());
+        if (!col_hindex_edge)
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal type {} of argument {} of function {}. Must be UInt64.",
+                arguments[0].type->getName(),
+                1,
+                getName());
+
+        const auto & data_hindex_edge = col_hindex_edge->getData();
+
+        auto dst = ColumnVector<UInt8>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const UInt64 edge = data_hindex_edge[row];
+            const UInt8 res = isValidDirectedEdge(edge);
+            dst_data[row] = res;
+        }
+
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3UnidirectionalEdgeIsValid(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3UnidirectionalEdgeIsValid>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/ilike.cpp b/src/Functions/ilike.cpp
index 1222cc48d07..b88d01986d5 100644
--- a/src/Functions/ilike.cpp
+++ b/src/Functions/ilike.cpp
@@ -12,7 +12,7 @@ struct NameILike
     static constexpr auto name = "ilike";
 };
 
-using ILikeImpl = MatchImpl<NameILike, true, false, true>;
+using ILikeImpl = MatchImpl<NameILike, MatchTraits::Syntax::Like, MatchTraits::Case::Insensitive, MatchTraits::Result::DontNegate>;
 using FunctionILike = FunctionsStringSearch<ILikeImpl>;
 
 }
diff --git a/src/Functions/isConstant.cpp b/src/Functions/isConstant.cpp
index 7ea3e26cb82..6d76cfc1dcc 100644
--- a/src/Functions/isConstant.cpp
+++ b/src/Functions/isConstant.cpp
@@ -27,6 +27,8 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool useDefaultImplementationForNothing() const override { return false; }
+
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     size_t getNumberOfArguments() const override
diff --git a/src/Functions/like.h b/src/Functions/like.h
index edb738d393b..9e25fc6f4c0 100644
--- a/src/Functions/like.h
+++ b/src/Functions/like.h
@@ -11,7 +11,7 @@ struct NameLike
     static constexpr auto name = "like";
 };
 
-using LikeImpl = MatchImpl<NameLike, true, false, false>;
+using LikeImpl = MatchImpl<NameLike, MatchTraits::Syntax::Like, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>;
 using FunctionLike = FunctionsStringSearch<LikeImpl>;
 
 }
diff --git a/src/Functions/likePatternToRegexp.h b/src/Functions/likePatternToRegexp.h
index 15e38e61ab4..319a3729e16 100644
--- a/src/Functions/likePatternToRegexp.h
+++ b/src/Functions/likePatternToRegexp.h
@@ -6,7 +6,7 @@ namespace DB
 {
 
 /// Transforms the [I]LIKE expression into regexp re2. For example, abc%def -> ^abc.*def$
-inline String likePatternToRegexp(const String & pattern)
+inline String likePatternToRegexp(std::string_view pattern)
 {
     String res;
     res.reserve(pattern.size() * 2);
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 471d6fc575c..8c891fdec81 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -65,6 +65,8 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    /// map(..., Nothing) -> Map(..., Nothing)
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/match.cpp b/src/Functions/match.cpp
index 4c329701464..a0789f229fd 100644
--- a/src/Functions/match.cpp
+++ b/src/Functions/match.cpp
@@ -13,7 +13,7 @@ struct NameMatch
     static constexpr auto name = "match";
 };
 
-using FunctionMatch = FunctionsStringSearch<MatchImpl<NameMatch, false, false, false>>;
+using FunctionMatch = FunctionsStringSearch<MatchImpl<NameMatch, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>>;
 
 }
 
diff --git a/src/Functions/normalizeString.cpp b/src/Functions/normalizeString.cpp
index 9b1d1292d2c..625247ca432 100644
--- a/src/Functions/normalizeString.cpp
+++ b/src/Functions/normalizeString.cpp
@@ -95,6 +95,8 @@ struct NormalizeUTF8Impl
         size_t size = offsets.size();
         res_offsets.resize(size);
 
+        res_data.reserve(data.size() * 2);
+
         ColumnString::Offset current_from_offset = 0;
         ColumnString::Offset current_to_offset = 0;
 
diff --git a/src/Functions/notILike.cpp b/src/Functions/notILike.cpp
index b5e06ac55f4..5e78db1c518 100644
--- a/src/Functions/notILike.cpp
+++ b/src/Functions/notILike.cpp
@@ -12,7 +12,7 @@ struct NameNotILike
     static constexpr auto name = "notILike";
 };
 
-using NotILikeImpl = MatchImpl<NameNotILike, true, true, true>;
+using NotILikeImpl = MatchImpl<NameNotILike, MatchTraits::Syntax::Like, MatchTraits::Case::Insensitive, MatchTraits::Result::Negate>;
 using FunctionNotILike = FunctionsStringSearch<NotILikeImpl>;
 
 }
diff --git a/src/Functions/notLike.cpp b/src/Functions/notLike.cpp
index 7fa1b6f9122..33a36748bb1 100644
--- a/src/Functions/notLike.cpp
+++ b/src/Functions/notLike.cpp
@@ -12,7 +12,7 @@ struct NameNotLike
     static constexpr auto name = "notLike";
 };
 
-using FunctionNotLike = FunctionsStringSearch<MatchImpl<NameNotLike, true, true, false>>;
+using FunctionNotLike = FunctionsStringSearch<MatchImpl<NameNotLike, MatchTraits::Syntax::Like, MatchTraits::Case::Sensitive, MatchTraits::Result::Negate>>;
 
 }
 
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index c3a9c411cbc..7d2369fd5e7 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -167,7 +167,7 @@ public:
 
         const auto & tuple_columns = tuple_col->getColumns();
 
-        const ColumnWithTypeAndName poly = arguments[1];
+        const ColumnWithTypeAndName & poly = arguments[1];
         const IColumn * poly_col = poly.column.get();
         const ColumnConst * const_poly_col = checkAndGetColumn<ColumnConst>(poly_col);
 
diff --git a/src/Functions/registerFunctions.cpp b/src/Functions/registerFunctions.cpp
index 0c67bf81d1e..bafaf61c2f5 100644
--- a/src/Functions/registerFunctions.cpp
+++ b/src/Functions/registerFunctions.cpp
@@ -68,7 +68,7 @@ void registerFunctionEncrypt(FunctionFactory & factory);
 void registerFunctionDecrypt(FunctionFactory & factory);
 void registerFunctionAESEncryptMysql(FunctionFactory & factory);
 void registerFunctionAESDecryptMysql(FunctionFactory & factory);
-
+void registerFunctionShowCertificate(FunctionFactory &);
 #endif
 
 void registerFunctions()
@@ -135,6 +135,7 @@ void registerFunctions()
     registerFunctionDecrypt(factory);
     registerFunctionAESEncryptMysql(factory);
     registerFunctionAESDecryptMysql(factory);
+    registerFunctionShowCertificate(factory);
 #endif
     registerFunctionTid(factory);
     registerFunctionLogTrace(factory);
diff --git a/src/Functions/registerFunctionsGeo.cpp b/src/Functions/registerFunctionsGeo.cpp
index c6043de3b97..006693a93be 100644
--- a/src/Functions/registerFunctionsGeo.cpp
+++ b/src/Functions/registerFunctionsGeo.cpp
@@ -60,7 +60,13 @@ void registerFunctionH3GetPentagonIndexes(FunctionFactory &);
 void registerFunctionH3Line(FunctionFactory &);
 void registerFunctionH3Distance(FunctionFactory &);
 void registerFunctionH3HexRing(FunctionFactory &);
-
+void registerFunctionH3GetUnidirectionalEdge(FunctionFactory &);
+void registerFunctionH3UnidirectionalEdgeIsValid(FunctionFactory &);
+void registerFunctionH3GetOriginIndexFromUnidirectionalEdge(FunctionFactory &);
+void registerFunctionH3GetDestinationIndexFromUnidirectionalEdge(FunctionFactory &);
+void registerFunctionH3GetIndexesFromUnidirectionalEdge(FunctionFactory &);
+void registerFunctionH3GetUnidirectionalEdgesFromHexagon(FunctionFactory &);
+void registerFunctionH3GetUnidirectionalEdgeBoundary(FunctionFactory &);
 #endif
 
 #if USE_S2_GEOMETRY
@@ -134,6 +140,13 @@ void registerFunctionsGeo(FunctionFactory & factory)
     registerFunctionH3Line(factory);
     registerFunctionH3Distance(factory);
     registerFunctionH3HexRing(factory);
+    registerFunctionH3GetUnidirectionalEdge(factory);
+    registerFunctionH3UnidirectionalEdgeIsValid(factory);
+    registerFunctionH3GetOriginIndexFromUnidirectionalEdge(factory);
+    registerFunctionH3GetDestinationIndexFromUnidirectionalEdge(factory);
+    registerFunctionH3GetIndexesFromUnidirectionalEdge(factory);
+    registerFunctionH3GetUnidirectionalEdgesFromHexagon(factory);
+    registerFunctionH3GetUnidirectionalEdgeBoundary(factory);
 #endif
 
 #if USE_S2_GEOMETRY
diff --git a/src/Functions/toColumnTypeName.cpp b/src/Functions/toColumnTypeName.cpp
index 95c35243567..345de2954c4 100644
--- a/src/Functions/toColumnTypeName.cpp
+++ b/src/Functions/toColumnTypeName.cpp
@@ -26,6 +26,8 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool useDefaultImplementationForNothing() const override { return false; }
+
     bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
     {
         settings.enable_lazy_execution_for_first_argument = true;
diff --git a/src/Functions/toNullable.cpp b/src/Functions/toNullable.cpp
index b7fe831f4ff..16d9f9198cd 100644
--- a/src/Functions/toNullable.cpp
+++ b/src/Functions/toNullable.cpp
@@ -28,6 +28,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index 41567ac1ee3..f3af49315ed 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -30,6 +30,8 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool useDefaultImplementationForNothing() const override { return false; }
+
     bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
     {
         settings.enable_lazy_execution_for_first_argument = false;
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index 6d5c53c0770..4238b12157a 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -52,6 +52,8 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    /// tuple(..., Nothing, ...) -> Tuple(..., Nothing, ...)
+    bool useDefaultImplementationForNothing() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/vectorFunctions.cpp b/src/Functions/vectorFunctions.cpp
index 62cfdcd9ee7..411b30040cc 100644
--- a/src/Functions/vectorFunctions.cpp
+++ b/src/Functions/vectorFunctions.cpp
@@ -1,4 +1,5 @@
 #include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNothing.h>
@@ -6,6 +7,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/ITupleFunction.h>
 #include <Functions/castTypeToEither.h>
+#include "Functions/IFunction.h"
 
 namespace DB
 {
@@ -808,16 +810,18 @@ public:
 
         const auto & p_column = arguments[1];
 
-        const auto * p_column_const = assert_cast<const ColumnConst *>(p_column.column.get());
+        if (!isColumnConst(*p_column.column) && p_column.column->size() != 1)
+            throw Exception{"Second argument for function " + getName() + " must be either constant Float64 or constant UInt", ErrorCodes::ILLEGAL_COLUMN};
+
         double p;
-        if (isFloat(p_column_const->getDataType()))
-            p = p_column_const->getFloat64(0);
-        else if (isUnsignedInteger(p_column_const->getDataType()))
-            p = p_column_const->getUInt(0);
+        if (isFloat(p_column.column->getDataType()))
+            p = p_column.column->getFloat64(0);
+        else if (isUnsignedInteger(p_column.column->getDataType()))
+            p = p_column.column->getUInt(0);
         else
             throw Exception{"Second argument for function " + getName() + " must be either constant Float64 or constant UInt", ErrorCodes::ILLEGAL_COLUMN};
 
-        if (p < 1 || p == HUGE_VAL)
+        if (p < 1 || p >= HUGE_VAL)
             throw Exception{"Second argument for function " + getName() + " must be not less than one and not be an infinity", ErrorCodes::ARGUMENT_OUT_OF_BOUND};
 
         auto abs = FunctionFactory::instance().get("abs", context);
@@ -1065,6 +1069,140 @@ public:
     }
 };
 
+
+/// An adaptor to call Norm/Distance function for tuple or array depending on the 1st argument type
+template <class Traits>
+class TupleOrArrayFunction : public IFunction
+{
+public:
+    static inline String name = Traits::name;
+
+    explicit TupleOrArrayFunction(ContextPtr context_)
+        : IFunction()
+        , tuple_function(Traits::CreateTupleFunction(context_))
+        , array_function(Traits::CreateArrayFunction(context_)) {}
+
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<TupleOrArrayFunction>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return tuple_function->getNumberOfArguments(); }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        bool is_array = checkDataTypes<DataTypeArray>(arguments[0].type.get());
+        return (is_array ? array_function : tuple_function)->getReturnTypeImpl(arguments);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        bool is_array = checkDataTypes<DataTypeArray>(arguments[0].type.get());
+        return (is_array ? array_function : tuple_function)->executeImpl(arguments, result_type, input_rows_count);
+    }
+
+private:
+    FunctionPtr tuple_function;
+    FunctionPtr array_function;
+};
+
+extern FunctionPtr createFunctionArrayL1Norm(ContextPtr context_);
+extern FunctionPtr createFunctionArrayL2Norm(ContextPtr context_);
+extern FunctionPtr createFunctionArrayLpNorm(ContextPtr context_);
+extern FunctionPtr createFunctionArrayLinfNorm(ContextPtr context_);
+
+extern FunctionPtr createFunctionArrayL1Distance(ContextPtr context_);
+extern FunctionPtr createFunctionArrayL2Distance(ContextPtr context_);
+extern FunctionPtr createFunctionArrayLpDistance(ContextPtr context_);
+extern FunctionPtr createFunctionArrayLinfDistance(ContextPtr context_);
+extern FunctionPtr createFunctionArrayCosineDistance(ContextPtr context_);
+
+struct L1NormTraits
+{
+    static inline String name = "L1Norm";
+
+    static constexpr auto CreateTupleFunction = FunctionL1Norm::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayL1Norm;
+};
+
+struct L2NormTraits
+{
+    static inline String name = "L2Norm";
+
+    static constexpr auto CreateTupleFunction = FunctionL2Norm::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayL2Norm;
+};
+
+struct LpNormTraits
+{
+    static inline String name = "LpNorm";
+
+    static constexpr auto CreateTupleFunction = FunctionLpNorm::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayLpNorm;
+};
+
+struct LinfNormTraits
+{
+    static inline String name = "LinfNorm";
+
+    static constexpr auto CreateTupleFunction = FunctionLinfNorm::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayLinfNorm;
+};
+
+struct L1DistanceTraits
+{
+    static inline String name = "L1Distance";
+
+    static constexpr auto CreateTupleFunction = FunctionL1Distance::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayL1Distance;
+};
+
+struct L2DistanceTraits
+{
+    static inline String name = "L2Distance";
+
+    static constexpr auto CreateTupleFunction = FunctionL2Distance::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayL2Distance;
+};
+
+struct LpDistanceTraits
+{
+    static inline String name = "LpDistance";
+
+    static constexpr auto CreateTupleFunction = FunctionLpDistance::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayLpDistance;
+};
+
+struct LinfDistanceTraits
+{
+    static inline String name = "LinfDistance";
+
+    static constexpr auto CreateTupleFunction = FunctionLinfDistance::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayLinfDistance;
+};
+
+struct CosineDistanceTraits
+{
+    static inline String name = "cosineDistance";
+
+    static constexpr auto CreateTupleFunction = FunctionCosineDistance::create;
+    static constexpr auto CreateArrayFunction = createFunctionArrayCosineDistance;
+};
+
+using TupleOrArrayFunctionL1Norm = TupleOrArrayFunction<L1NormTraits>;
+using TupleOrArrayFunctionL2Norm = TupleOrArrayFunction<L2NormTraits>;
+using TupleOrArrayFunctionLpNorm = TupleOrArrayFunction<LpNormTraits>;
+using TupleOrArrayFunctionLinfNorm = TupleOrArrayFunction<LinfNormTraits>;
+
+using TupleOrArrayFunctionL1Distance = TupleOrArrayFunction<L1DistanceTraits>;
+using TupleOrArrayFunctionL2Distance = TupleOrArrayFunction<L2DistanceTraits>;
+using TupleOrArrayFunctionLpDistance = TupleOrArrayFunction<LpDistanceTraits>;
+using TupleOrArrayFunctionLinfDistance = TupleOrArrayFunction<LinfDistanceTraits>;
+using TupleOrArrayFunctionCosineDistance = TupleOrArrayFunction<CosineDistanceTraits>;
+
 void registerVectorFunctions(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionTuplePlus>();
@@ -1081,20 +1219,20 @@ void registerVectorFunctions(FunctionFactory & factory)
     factory.registerFunction<FunctionDotProduct>();
     factory.registerAlias("scalarProduct", FunctionDotProduct::name, FunctionFactory::CaseInsensitive);
 
-    factory.registerFunction<FunctionL1Norm>();
-    factory.registerFunction<FunctionL2Norm>();
-    factory.registerFunction<FunctionLinfNorm>();
-    factory.registerFunction<FunctionLpNorm>();
+    factory.registerFunction<TupleOrArrayFunctionL1Norm>();
+    factory.registerFunction<TupleOrArrayFunctionL2Norm>();
+    factory.registerFunction<TupleOrArrayFunctionLinfNorm>();
+    factory.registerFunction<TupleOrArrayFunctionLpNorm>();
 
-    factory.registerAlias("normL1", FunctionL1Norm::name, FunctionFactory::CaseInsensitive);
-    factory.registerAlias("normL2", FunctionL2Norm::name, FunctionFactory::CaseInsensitive);
-    factory.registerAlias("normLinf", FunctionLinfNorm::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normL1", TupleOrArrayFunctionL1Norm::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normL2", TupleOrArrayFunctionL2Norm::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normLinf", TupleOrArrayFunctionLinfNorm::name, FunctionFactory::CaseInsensitive);
     factory.registerAlias("normLp", FunctionLpNorm::name, FunctionFactory::CaseInsensitive);
 
-    factory.registerFunction<FunctionL1Distance>();
-    factory.registerFunction<FunctionL2Distance>();
-    factory.registerFunction<FunctionLinfDistance>();
-    factory.registerFunction<FunctionLpDistance>();
+    factory.registerFunction<TupleOrArrayFunctionL1Distance>();
+    factory.registerFunction<TupleOrArrayFunctionL2Distance>();
+    factory.registerFunction<TupleOrArrayFunctionLinfDistance>();
+    factory.registerFunction<TupleOrArrayFunctionLpDistance>();
 
     factory.registerAlias("distanceL1", FunctionL1Distance::name, FunctionFactory::CaseInsensitive);
     factory.registerAlias("distanceL2", FunctionL2Distance::name, FunctionFactory::CaseInsensitive);
@@ -1111,6 +1249,6 @@ void registerVectorFunctions(FunctionFactory & factory)
     factory.registerAlias("normalizeLinf", FunctionLinfNormalize::name, FunctionFactory::CaseInsensitive);
     factory.registerAlias("normalizeLp", FunctionLpNormalize::name, FunctionFactory::CaseInsensitive);
 
-    factory.registerFunction<FunctionCosineDistance>();
+    factory.registerFunction<TupleOrArrayFunctionCosineDistance>();
 }
 }
diff --git a/src/IO/ReadBufferFromAzureBlobStorage.cpp b/src/IO/ReadBufferFromAzureBlobStorage.cpp
index 41cec694786..2576b10f9ac 100644
--- a/src/IO/ReadBufferFromAzureBlobStorage.cpp
+++ b/src/IO/ReadBufferFromAzureBlobStorage.cpp
@@ -21,7 +21,7 @@ namespace ErrorCodes
 
 
 ReadBufferFromAzureBlobStorage::ReadBufferFromAzureBlobStorage(
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
     const String & path_,
     size_t max_single_read_retries_,
     size_t max_single_download_retries_,
diff --git a/src/IO/ReadBufferFromAzureBlobStorage.h b/src/IO/ReadBufferFromAzureBlobStorage.h
index 80078afd6d0..e5a39b84d45 100644
--- a/src/IO/ReadBufferFromAzureBlobStorage.h
+++ b/src/IO/ReadBufferFromAzureBlobStorage.h
@@ -17,17 +17,17 @@ class ReadBufferFromAzureBlobStorage : public SeekableReadBuffer, public WithFil
 {
 public:
 
-    explicit ReadBufferFromAzureBlobStorage(
-        std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
+    ReadBufferFromAzureBlobStorage(
+        std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
         const String & path_,
         size_t max_single_read_retries_,
         size_t max_single_download_retries_,
         size_t tmp_buffer_size_,
         bool use_external_buffer_ = false,
-        size_t read_until_position_ = 0
-    );
+        size_t read_until_position_ = 0);
 
     off_t seek(off_t off, int whence) override;
+
     off_t getPosition() override;
 
     bool nextImpl() override;
@@ -41,7 +41,7 @@ private:
     void initialize();
 
     std::unique_ptr<Azure::Core::IO::BodyStream> data_stream;
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
     std::unique_ptr<Azure::Storage::Blobs::BlobClient> blob_client;
 
     const String path;
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index c1b2ec7db0f..5b1d278f4c2 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -37,7 +37,7 @@ namespace ErrorCodes
 
 
 ReadBufferFromS3::ReadBufferFromS3(
-    std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+    std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
     const String & bucket_,
     const String & key_,
     const String & version_id_,
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index 5c8396cd6d8..c5f72c7414f 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -29,7 +29,7 @@ namespace DB
 class ReadBufferFromS3 : public SeekableReadBuffer, public WithFileName, public WithFileSize
 {
 private:
-    std::shared_ptr<Aws::S3::S3Client> client_ptr;
+    std::shared_ptr<const Aws::S3::S3Client> client_ptr;
     String bucket;
     String key;
     String version_id;
@@ -48,7 +48,7 @@ private:
 
 public:
     ReadBufferFromS3(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+        std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
         const String & version_id_,
@@ -94,7 +94,7 @@ class ReadBufferS3Factory : public ParallelReadBuffer::ReadBufferFactory, public
 {
 public:
     explicit ReadBufferS3Factory(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+        std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
         const String & version_id_,
@@ -125,7 +125,7 @@ public:
     String getFileName() const override { return bucket + "/" + key; }
 
 private:
-    std::shared_ptr<Aws::S3::S3Client> client_ptr;
+    std::shared_ptr<const Aws::S3::S3Client> client_ptr;
     const String bucket;
     const String key;
     const String version_id;
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index e11c57947d1..feacbd085c2 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -2,6 +2,8 @@
 
 #include <cmath>
 #include <cstring>
+#include <string>
+#include <string_view>
 #include <limits>
 #include <algorithm>
 #include <iterator>
@@ -1366,6 +1368,12 @@ inline T parse(const String & s)
     return parse<T>(s.data(), s.size());
 }
 
+template <typename T>
+inline T parse(std::string_view s)
+{
+    return parse<T>(s.data(), s.size());
+}
+
 template <typename T>
 inline bool tryParse(T & res, const char * data)
 {
@@ -1378,6 +1386,12 @@ inline bool tryParse(T & res, const String & s)
     return tryParse(res, s.data(), s.size());
 }
 
+template <typename T>
+inline bool tryParse(T & res, std::string_view s)
+{
+    return tryParse(res, s.data(), s.size());
+}
+
 
 /** Skip UTF-8 BOM if it is under cursor.
   * As BOM is usually located at start of stream, and buffer size is usually larger than three bytes,
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 0dcc87e6c0a..8984bd18b4c 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -54,10 +54,12 @@ namespace DB::S3
 PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
         const String & force_region_,
         const RemoteHostFilter & remote_host_filter_,
-        unsigned int s3_max_redirects_)
+        unsigned int s3_max_redirects_,
+        bool enable_s3_requests_logging_)
     : force_region(force_region_)
     , remote_host_filter(remote_host_filter_)
     , s3_max_redirects(s3_max_redirects_)
+    , enable_s3_requests_logging(enable_s3_requests_logging_)
 {
 }
 
@@ -92,16 +94,17 @@ void PocoHTTPClientConfiguration::updateSchemeAndRegion()
 }
 
 
-PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfiguration)
-    : per_request_configuration(clientConfiguration.perRequestConfiguration)
-    , error_report(clientConfiguration.error_report)
+PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & client_configuration)
+    : per_request_configuration(client_configuration.perRequestConfiguration)
+    , error_report(client_configuration.error_report)
     , timeouts(ConnectionTimeouts(
-          Poco::Timespan(clientConfiguration.connectTimeoutMs * 1000), /// connection timeout.
-          Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000), /// send timeout.
-          Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000) /// receive timeout.
+          Poco::Timespan(client_configuration.connectTimeoutMs * 1000), /// connection timeout.
+          Poco::Timespan(client_configuration.requestTimeoutMs * 1000), /// send timeout.
+          Poco::Timespan(client_configuration.requestTimeoutMs * 1000) /// receive timeout.
           ))
-    , remote_host_filter(clientConfiguration.remote_host_filter)
-    , s3_max_redirects(clientConfiguration.s3_max_redirects)
+    , remote_host_filter(client_configuration.remote_host_filter)
+    , s3_max_redirects(client_configuration.s3_max_redirects)
+    , enable_s3_requests_logging(client_configuration.enable_s3_requests_logging)
 {
 }
 
@@ -124,7 +127,8 @@ void PocoHTTPClient::makeRequestInternal(
     Poco::Logger * log = &Poco::Logger::get("AWSClient");
 
     auto uri = request.GetUri().GetURIString();
-    LOG_TEST(log, "Make request to: {}", uri);
+    if (enable_s3_requests_logging)
+        LOG_TEST(log, "Make request to: {}", uri);
 
     enum class S3MetricType
     {
@@ -197,32 +201,25 @@ void PocoHTTPClient::makeRequestInternal(
 
             Poco::Net::HTTPRequest poco_request(Poco::Net::HTTPRequest::HTTP_1_1);
 
-            /** Aws::Http::URI will encode URL in appropriate way for AWS S3 server.
-              * Poco::URI also does that correctly but it's not compatible with AWS.
-              * For example, `+` symbol will not be converted to `%2B` by Poco and would
-              * be received as space symbol.
-              *
-              * References:
-              * https://github.com/aws/aws-sdk-java/issues/1946
-              * https://forums.aws.amazon.com/thread.jspa?threadID=55746
-              *
-              * Example:
-              * Suppose we are requesting a file: abc+def.txt
-              * To correctly do it, we need to construct an URL containing either:
-              * - abc%2Bdef.txt
-              * this is also technically correct:
-              * - abc+def.txt
-              * but AWS servers don't support it properly, interpreting plus character as whitespace
-              * although it is in path part, not in query string.
-              * e.g. this is not correct:
-              * - abc%20def.txt
-              *
-              * Poco will keep plus character as is (which is correct) while AWS servers will treat it as whitespace, which is not what is intended.
-              * To overcome this limitation, we encode URL with "Aws::Http::URI" and then pass already prepared URL to Poco.
+            /** According to RFC-2616, Request-URI is allowed to be encoded.
+              * However, there is no clear agreement on which exact symbols must be encoded.
+              * Effectively, `Poco::URI` chooses smaller subset of characters to encode,
+              * whereas Amazon S3 and Google Cloud Storage expects another one.
+              * In order to successfully execute a request, a path must be exact representation
+              * of decoded path used by `S3AuthSigner`.
+              * Therefore we shall encode some symbols "manually" to fit the signatures.
               */
 
-            Aws::Http::URI aws_target_uri(uri);
-            poco_request.setURI(aws_target_uri.GetPath() + aws_target_uri.GetQueryString());
+            std::string path_and_query;
+            const std::string & query = target_uri.getRawQuery();
+            const std::string reserved = "?#:;+@&=%"; /// Poco::URI::RESERVED_QUERY_PARAM without '/' plus percent sign.
+            Poco::URI::encode(target_uri.getPath(), reserved, path_and_query);
+            if (!query.empty())
+            {
+                path_and_query += '?';
+                path_and_query += query;
+            }
+            poco_request.setURI(path_and_query);
 
             switch (request.GetMethod())
             {
@@ -257,7 +254,8 @@ void PocoHTTPClient::makeRequestInternal(
 
             if (request.GetContentBody())
             {
-                LOG_TEST(log, "Writing request body.");
+                if (enable_s3_requests_logging)
+                    LOG_TEST(log, "Writing request body.");
 
                 if (attempt > 0) /// rewind content body buffer.
                 {
@@ -265,24 +263,28 @@ void PocoHTTPClient::makeRequestInternal(
                     request.GetContentBody()->seekg(0);
                 }
                 auto size = Poco::StreamCopier::copyStream(*request.GetContentBody(), request_body_stream);
-                LOG_TEST(log, "Written {} bytes to request body", size);
+                if (enable_s3_requests_logging)
+                    LOG_TEST(log, "Written {} bytes to request body", size);
             }
 
-            LOG_TEST(log, "Receiving response...");
+            if (enable_s3_requests_logging)
+                LOG_TEST(log, "Receiving response...");
             auto & response_body_stream = session->receiveResponse(poco_response);
 
             watch.stop();
             ProfileEvents::increment(select_metric(S3MetricType::Microseconds), watch.elapsedMicroseconds());
 
             int status_code = static_cast<int>(poco_response.getStatus());
-            LOG_TEST(log, "Response status: {}, {}", status_code, poco_response.getReason());
+            if (enable_s3_requests_logging)
+                LOG_TEST(log, "Response status: {}, {}", status_code, poco_response.getReason());
 
             if (poco_response.getStatus() == Poco::Net::HTTPResponse::HTTP_TEMPORARY_REDIRECT)
             {
                 auto location = poco_response.get("location");
                 remote_host_filter.checkURL(Poco::URI(location));
                 uri = location;
-                LOG_TEST(log, "Redirecting request to new location: {}", location);
+                if (enable_s3_requests_logging)
+                    LOG_TEST(log, "Redirecting request to new location: {}", location);
 
                 ProfileEvents::increment(select_metric(S3MetricType::Redirects));
 
@@ -292,13 +294,21 @@ void PocoHTTPClient::makeRequestInternal(
             response->SetResponseCode(static_cast<Aws::Http::HttpResponseCode>(status_code));
             response->SetContentType(poco_response.getContentType());
 
-            WriteBufferFromOwnString headers_ss;
-            for (const auto & [header_name, header_value] : poco_response)
+            if (enable_s3_requests_logging)
             {
-                response->AddHeader(header_name, header_value);
-                headers_ss << header_name << ": " << header_value << "; ";
+                WriteBufferFromOwnString headers_ss;
+                for (const auto & [header_name, header_value] : poco_response)
+                {
+                    response->AddHeader(header_name, header_value);
+                    headers_ss << header_name << ": " << header_value << "; ";
+                }
+                LOG_TEST(log, "Received headers: {}", headers_ss.str());
+            }
+            else
+            {
+                for (const auto & [header_name, header_value] : poco_response)
+                    response->AddHeader(header_name, header_value);
             }
-            LOG_TEST(log, "Received headers: {}", headers_ss.str());
 
             if (status_code == 429 || status_code == 503)
             { // API throttling
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index defd029f05a..3897097b196 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -32,13 +32,14 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
     String force_region;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
+    bool enable_s3_requests_logging;
 
     void updateSchemeAndRegion();
 
     std::function<void(const Aws::Client::ClientConfigurationPerRequest &)> error_report;
 
 private:
-    PocoHTTPClientConfiguration(const String & force_region_, const RemoteHostFilter & remote_host_filter_, unsigned int s3_max_redirects_);
+    PocoHTTPClientConfiguration(const String & force_region_, const RemoteHostFilter & remote_host_filter_, unsigned int s3_max_redirects_, bool enable_s3_requests_logging_);
 
     /// Constructor of Aws::Client::ClientConfiguration must be called after AWS SDK initialization.
     friend ClientFactory;
@@ -79,7 +80,7 @@ private:
 class PocoHTTPClient : public Aws::Http::HttpClient
 {
 public:
-    explicit PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfiguration);
+    explicit PocoHTTPClient(const PocoHTTPClientConfiguration & client_configuration);
     ~PocoHTTPClient() override = default;
 
     std::shared_ptr<Aws::Http::HttpResponse> MakeRequest(
@@ -99,6 +100,7 @@ private:
     ConnectionTimeouts timeouts;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
+    bool enable_s3_requests_logging;
 };
 
 }
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index d7b3a9bde02..c283afb21e4 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -61,7 +61,8 @@ const std::pair<DB::LogsLevel, Poco::Message::Priority> & convertLogLevel(Aws::U
 class AWSLogger final : public Aws::Utils::Logging::LogSystemInterface
 {
 public:
-    AWSLogger()
+    explicit AWSLogger(bool enable_s3_requests_logging_)
+        :enable_s3_requests_logging(enable_s3_requests_logging_)
     {
         for (auto [tag, name] : S3_LOGGER_TAG_NAMES)
             tag_loggers[tag] = &Poco::Logger::get(name);
@@ -71,7 +72,13 @@ public:
 
     ~AWSLogger() final = default;
 
-    Aws::Utils::Logging::LogLevel GetLogLevel() const final { return Aws::Utils::Logging::LogLevel::Trace; }
+    Aws::Utils::Logging::LogLevel GetLogLevel() const final
+    {
+        if (enable_s3_requests_logging)
+            return Aws::Utils::Logging::LogLevel::Trace;
+        else
+            return Aws::Utils::Logging::LogLevel::Info;
+    }
 
     void Log(Aws::Utils::Logging::LogLevel log_level, const char * tag, const char * format_str, ...) final // NOLINT
     {
@@ -100,6 +107,7 @@ public:
 
 private:
     Poco::Logger * default_logger;
+    bool enable_s3_requests_logging;
     std::unordered_map<String, Poco::Logger *> tag_loggers;
 };
 
@@ -535,7 +543,7 @@ public:
             /// AWS API tries credentials providers one by one. Some of providers (like ProfileConfigFileAWSCredentialsProvider) can be
             /// quite verbose even if nobody configured them. So we use our provider first and only after it use default providers.
             {
-                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(configuration.region, configuration.remote_host_filter, configuration.s3_max_redirects);
+                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(configuration.region, configuration.remote_host_filter, configuration.s3_max_redirects, configuration.enable_s3_requests_logging);
                 AddProvider(std::make_shared<AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider>(aws_client_configuration));
             }
 
@@ -572,7 +580,7 @@ public:
             }
             else if (Aws::Utils::StringUtils::ToLower(ec2_metadata_disabled.c_str()) != "true")
             {
-                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(configuration.region, configuration.remote_host_filter, configuration.s3_max_redirects);
+                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(configuration.region, configuration.remote_host_filter, configuration.s3_max_redirects, configuration.enable_s3_requests_logging);
 
                 /// See MakeDefaultHttpResourceClientConfiguration().
                 /// This is part of EC2 metadata client, but unfortunately it can't be accessed from outside
@@ -692,7 +700,7 @@ namespace S3
     {
         aws_options = Aws::SDKOptions{};
         Aws::InitAPI(aws_options);
-        Aws::Utils::Logging::InitializeAWSLogging(std::make_shared<AWSLogger>());
+        Aws::Utils::Logging::InitializeAWSLogging(std::make_shared<AWSLogger>(false));
         Aws::Http::SetHttpClientFactory(std::make_shared<PocoHTTPClientFactory>());
     }
 
@@ -708,7 +716,7 @@ namespace S3
         return ret;
     }
 
-    std::shared_ptr<Aws::S3::S3Client> ClientFactory::create( // NOLINT
+    std::unique_ptr<Aws::S3::S3Client> ClientFactory::create( // NOLINT
         const PocoHTTPClientConfiguration & cfg_,
         bool is_virtual_hosted_style,
         const String & access_key_id,
@@ -746,7 +754,7 @@ namespace S3
             use_environment_credentials,
             use_insecure_imds_request);
 
-        return std::make_shared<Aws::S3::S3Client>(
+        return std::make_unique<Aws::S3::S3Client>(
             std::move(auth_signer),
             std::move(client_configuration), // Client configuration.
             is_virtual_hosted_style || client_configuration.endpointOverride.empty() // Use virtual addressing only if endpoint is not specified.
@@ -756,9 +764,10 @@ namespace S3
     PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
         const String & force_region,
         const RemoteHostFilter & remote_host_filter,
-        unsigned int s3_max_redirects)
+        unsigned int s3_max_redirects,
+        bool enable_s3_requestrs_logging)
     {
-        return PocoHTTPClientConfiguration(force_region, remote_host_filter, s3_max_redirects);
+        return PocoHTTPClientConfiguration(force_region, remote_host_filter, s3_max_redirects, enable_s3_requestrs_logging);
     }
 
     URI::URI(const Poco::URI & uri_)
@@ -856,7 +865,7 @@ namespace S3
                             quoteString(bucket), !uri.empty() ? " (" + uri.toString() + ")" : "");
     }
 
-    size_t getObjectSize(std::shared_ptr<Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id, bool throw_on_error)
+    size_t getObjectSize(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id, bool throw_on_error)
     {
         Aws::S3::Model::HeadObjectRequest req;
         req.SetBucket(bucket);
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 16134f173d5..98471f5b81f 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -31,7 +31,7 @@ public:
 
     static ClientFactory & instance();
 
-    std::shared_ptr<Aws::S3::S3Client> create(
+    std::unique_ptr<Aws::S3::S3Client> create(
         const PocoHTTPClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
@@ -44,12 +44,14 @@ public:
     PocoHTTPClientConfiguration createClientConfiguration(
         const String & force_region,
         const RemoteHostFilter & remote_host_filter,
-        unsigned int s3_max_redirects);
+        unsigned int s3_max_redirects,
+        bool enable_s3_requestrs_logging);
 
 private:
     ClientFactory();
 
     Aws::SDKOptions aws_options;
+    std::atomic<bool> s3_requests_logging_enabled;
 };
 
 /**
@@ -76,7 +78,7 @@ struct URI
     static void validateBucket(const String & bucket, const Poco::URI & uri);
 };
 
-size_t getObjectSize(std::shared_ptr<Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id = {}, bool throw_on_error = true);
+size_t getObjectSize(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id = {}, bool throw_on_error = true);
 
 }
 
diff --git a/src/IO/WriteBufferFromAzureBlobStorage.cpp b/src/IO/WriteBufferFromAzureBlobStorage.cpp
index eef1c8108fa..51d8bf6aba2 100644
--- a/src/IO/WriteBufferFromAzureBlobStorage.cpp
+++ b/src/IO/WriteBufferFromAzureBlobStorage.cpp
@@ -3,7 +3,6 @@
 #if USE_AZURE_BLOB_STORAGE
 
 #include <IO/WriteBufferFromAzureBlobStorage.h>
-#include <Disks/RemoteDisksCommon.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
 
@@ -12,14 +11,18 @@ namespace DB
 {
 
 WriteBufferFromAzureBlobStorage::WriteBufferFromAzureBlobStorage(
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
     const String & blob_path_,
     size_t max_single_part_upload_size_,
-    size_t buf_size_) :
-    BufferWithOwnMemory<WriteBuffer>(buf_size_, nullptr, 0),
-    blob_container_client(blob_container_client_),
-    max_single_part_upload_size(max_single_part_upload_size_),
-    blob_path(blob_path_) {}
+    size_t buf_size_,
+    std::optional<std::map<std::string, std::string>> attributes_)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size_, nullptr, 0)
+    , blob_container_client(blob_container_client_)
+    , max_single_part_upload_size(max_single_part_upload_size_)
+    , blob_path(blob_path_)
+    , attributes(attributes_)
+{
+}
 
 
 WriteBufferFromAzureBlobStorage::~WriteBufferFromAzureBlobStorage()
@@ -29,6 +32,15 @@ WriteBufferFromAzureBlobStorage::~WriteBufferFromAzureBlobStorage()
 
 void WriteBufferFromAzureBlobStorage::finalizeImpl()
 {
+    if (attributes.has_value())
+    {
+        auto blob_client = blob_container_client->GetBlobClient(blob_path);
+        Azure::Storage::Metadata metadata;
+        for (const auto & [key, value] : *attributes)
+            metadata[key] = value;
+        blob_client.SetMetadata(metadata);
+    }
+
     const size_t max_tries = 3;
     for (size_t i = 0; i < max_tries; ++i)
     {
diff --git a/src/IO/WriteBufferFromAzureBlobStorage.h b/src/IO/WriteBufferFromAzureBlobStorage.h
index 75336c497eb..ef13a24abd8 100644
--- a/src/IO/WriteBufferFromAzureBlobStorage.h
+++ b/src/IO/WriteBufferFromAzureBlobStorage.h
@@ -19,11 +19,12 @@ class WriteBufferFromAzureBlobStorage : public BufferWithOwnMemory<WriteBuffer>
 {
 public:
 
-    explicit WriteBufferFromAzureBlobStorage(
-        std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
+    WriteBufferFromAzureBlobStorage(
+        std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
         const String & blob_path_,
         size_t max_single_part_upload_size_,
-        size_t buf_size_);
+        size_t buf_size_,
+        std::optional<std::map<std::string, std::string>> attributes_ = {});
 
     ~WriteBufferFromAzureBlobStorage() override;
 
@@ -32,9 +33,10 @@ public:
 private:
     void finalizeImpl() override;
 
-    std::shared_ptr<Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
     size_t max_single_part_upload_size;
     const String blob_path;
+    std::optional<std::map<std::string, std::string>> attributes;
 };
 
 }
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index c25eed0e6c5..2570a0d7c17 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -54,7 +54,7 @@ struct WriteBufferFromS3::PutObjectTask
 };
 
 WriteBufferFromS3::WriteBufferFromS3(
-    std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+    std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
     const String & bucket_,
     const String & key_,
     const S3Settings::ReadWriteSettings & s3_settings_,
@@ -65,10 +65,10 @@ WriteBufferFromS3::WriteBufferFromS3(
     : BufferWithOwnMemory<WriteBuffer>(buffer_size_, nullptr, 0)
     , bucket(bucket_)
     , key(key_)
-    , object_metadata(std::move(object_metadata_))
     , client_ptr(std::move(client_ptr_))
     , upload_part_size(s3_settings_.min_upload_part_size)
     , s3_settings(s3_settings_)
+    , object_metadata(std::move(object_metadata_))
     , schedule(std::move(schedule_))
     , cache(cache_)
 {
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 6279e519be0..7dbaad72940 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -48,7 +48,7 @@ class WriteBufferFromS3 final : public BufferWithOwnMemory<WriteBuffer>
 {
 public:
     WriteBufferFromS3(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+        std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
         const S3Settings::ReadWriteSettings & s3_settings_,
@@ -90,10 +90,11 @@ private:
 
     String bucket;
     String key;
-    std::optional<std::map<String, String>> object_metadata;
-    std::shared_ptr<Aws::S3::S3Client> client_ptr;
+    std::shared_ptr<const Aws::S3::S3Client> client_ptr;
     size_t upload_part_size = 0;
     S3Settings::ReadWriteSettings s3_settings;
+    std::optional<std::map<String, String>> object_metadata;
+
     /// Buffer to accumulate data.
     std::shared_ptr<Aws::StringStream> temporary_buffer;
     size_t last_part_size = 0;
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index c57b85951bc..eacdd221d6e 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -1,6 +1,12 @@
+#include <memory>
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnFixedString.h>
+#include <Core/ColumnNumbers.h>
+#include <Core/ColumnWithTypeAndName.h>
 
+#include <Functions/grouping.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsMiscellaneous.h>
 
@@ -8,10 +14,12 @@
 
 #include <DataTypes/DataTypeSet.h>
 #include <DataTypes/DataTypeFunction.h>
+#include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/FieldToDataType.h>
 
 #include <Columns/ColumnSet.h>
@@ -56,6 +64,9 @@ namespace ErrorCodes
     extern const int INCORRECT_ELEMENT_OF_SET;
     extern const int BAD_ARGUMENTS;
     extern const int DUPLICATE_COLUMN;
+    extern const int LOGICAL_ERROR;
+    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+    extern const int TOO_MANY_ARGUMENTS_FOR_FUNCTION;
 }
 
 static NamesAndTypesList::iterator findColumn(const String & name, NamesAndTypesList & cols)
@@ -459,10 +470,18 @@ public:
 };
 
 ActionsMatcher::Data::Data(
-    ContextPtr context_, SizeLimits set_size_limit_, size_t subquery_depth_,
-    const NamesAndTypesList & source_columns_, ActionsDAGPtr actions_dag,
-    PreparedSets & prepared_sets_, SubqueriesForSets & subqueries_for_sets_,
-    bool no_subqueries_, bool no_makeset_, bool only_consts_, bool create_source_for_in_)
+    ContextPtr context_,
+    SizeLimits set_size_limit_,
+    size_t subquery_depth_,
+    std::reference_wrapper<const NamesAndTypesList> source_columns_,
+    ActionsDAGPtr actions_dag,
+    PreparedSets & prepared_sets_,
+    SubqueriesForSets & subqueries_for_sets_,
+    bool no_subqueries_,
+    bool no_makeset_,
+    bool only_consts_,
+    bool create_source_for_in_,
+    AggregationKeysInfo aggregation_keys_info_)
     : WithContext(context_)
     , set_size_limit(set_size_limit_)
     , subquery_depth(subquery_depth_)
@@ -475,6 +494,7 @@ ActionsMatcher::Data::Data(
     , create_source_for_in(create_source_for_in_)
     , visit_depth(0)
     , actions_stack(std::move(actions_dag), context_)
+    , aggregation_keys_info(aggregation_keys_info_)
     , next_unique_suffix(actions_stack.getLastActions().getIndex().size() + 1)
 {
 }
@@ -817,6 +837,55 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         return;
     }
 
+    if (node.name == "grouping")
+    {
+        if (data.only_consts)
+            return; // Can not perform constant folding, because this function can be executed only after GROUP BY
+
+        size_t arguments_size = node.arguments->children.size();
+        if (arguments_size == 0)
+            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function GROUPING expects at least one argument");
+        if (arguments_size > 64)
+            throw Exception(ErrorCodes::TOO_MANY_ARGUMENTS_FOR_FUNCTION, "Function GROUPING can have up to 64 arguments, but {} provided", arguments_size);
+        auto keys_info = data.aggregation_keys_info;
+        auto aggregation_keys_number = keys_info.aggregation_keys.size();
+
+        ColumnNumbers arguments_indexes;
+        for (auto const & arg : node.arguments->children)
+        {
+            size_t pos = keys_info.aggregation_keys.getPosByName(arg->getColumnName());
+            if (pos == aggregation_keys_number)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Argument of GROUPING function {} is not a part of GROUP BY clause", arg->getColumnName());
+            arguments_indexes.push_back(pos);
+        }
+
+        switch (keys_info.group_by_kind)
+        {
+            case GroupByKind::GROUPING_SETS:
+            {
+                data.addFunction(std::make_shared<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGroupingForGroupingSets>(std::move(arguments_indexes), keys_info.grouping_set_keys)), { "__grouping_set" }, column_name);
+                break;
+            }
+            case GroupByKind::ROLLUP:
+                data.addFunction(std::make_shared<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGroupingForRollup>(std::move(arguments_indexes), aggregation_keys_number)), { "__grouping_set" }, column_name);
+                break;
+            case GroupByKind::CUBE:
+            {
+                data.addFunction(std::make_shared<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGroupingForCube>(std::move(arguments_indexes), aggregation_keys_number)), { "__grouping_set" }, column_name);
+                break;
+            }
+            case GroupByKind::ORDINARY:
+            {
+                data.addFunction(std::make_shared<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGroupingOrdinary>(std::move(arguments_indexes))), {}, column_name);
+                break;
+            }
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Unexpected kind of GROUP BY clause for GROUPING function: {}", keys_info.group_by_kind);
+        }
+        return;
+    }
+
     SetPtr prepared_set;
     if (checkFunctionIsInOrGlobalInOperator(node))
     {
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index d1558cb961c..5a74124192c 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -1,10 +1,12 @@
 #pragma once
 
+#include <Core/NamesAndTypes.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/PreparedSets.h>
 #include <Interpreters/SubqueryForSet.h>
 #include <Parsers/IAST.h>
+#include <Core/ColumnNumbers.h>
 
 
 namespace DB
@@ -76,6 +78,42 @@ class ASTIdentifier;
 class ASTFunction;
 class ASTLiteral;
 
+enum class GroupByKind
+{
+    NONE,
+    ORDINARY,
+    ROLLUP,
+    CUBE,
+    GROUPING_SETS,
+};
+
+/*
+ * This class stores information about aggregation keys used in GROUP BY clause.
+ * It's used for providing information about aggregation to GROUPING function
+ * implementation.
+*/
+struct AggregationKeysInfo
+{
+    AggregationKeysInfo(
+        std::reference_wrapper<const NamesAndTypesList> aggregation_keys_,
+        std::reference_wrapper<const ColumnNumbersList> grouping_set_keys_,
+        GroupByKind group_by_kind_)
+        : aggregation_keys(aggregation_keys_)
+        , grouping_set_keys(grouping_set_keys_)
+        , group_by_kind(group_by_kind_)
+    {}
+
+    AggregationKeysInfo(const AggregationKeysInfo &) = default;
+    AggregationKeysInfo(AggregationKeysInfo &&) = default;
+
+    // Names and types of all used keys
+    const NamesAndTypesList & aggregation_keys;
+    // Indexes of aggregation keys used in each grouping set (only for GROUP BY GROUPING SETS)
+    const ColumnNumbersList & grouping_set_keys;
+
+    GroupByKind group_by_kind;
+};
+
 /// Collect ExpressionAction from AST. Returns PreparedSets and SubqueriesForSets too.
 class ActionsMatcher
 {
@@ -95,6 +133,7 @@ public:
         bool create_source_for_in;
         size_t visit_depth;
         ScopeStack actions_stack;
+        AggregationKeysInfo aggregation_keys_info;
 
         /*
          * Remember the last unique column suffix to avoid quadratic behavior
@@ -107,14 +146,15 @@ public:
             ContextPtr context_,
             SizeLimits set_size_limit_,
             size_t subquery_depth_,
-            const NamesAndTypesList & source_columns_,
+            std::reference_wrapper<const NamesAndTypesList> source_columns_,
             ActionsDAGPtr actions_dag,
             PreparedSets & prepared_sets_,
             SubqueriesForSets & subqueries_for_sets_,
             bool no_subqueries_,
             bool no_makeset_,
             bool only_consts_,
-            bool create_source_for_in_);
+            bool create_source_for_in_,
+            AggregationKeysInfo aggregation_keys_info_);
 
         /// Does result of the calculation already exists in the block.
         bool hasColumn(const String & column_name) const;
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 409b28a166d..efc2288e227 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -29,7 +29,7 @@
 #include <Storages/CompressionCodecSelector.h>
 #include <Storages/StorageS3Settings.h>
 #include <Disks/DiskLocal.h>
-#include <Disks/IDiskRemote.h>
+#include <Disks/ObjectStorages/IObjectStorage.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/ActionLocksManager.h>
 #include <Interpreters/ExternalLoaderXMLConfigRepository.h>
@@ -313,7 +313,7 @@ struct ContextSharedPart
         /// since it may use per-user MemoryTracker which will be destroyed here.
         try
         {
-            IDiskRemote::getThreadPoolWriter().wait();
+            IObjectStorage::getThreadPoolWriter().wait();
         }
         catch (...)
         {
@@ -1078,7 +1078,7 @@ void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have query factories info");
 
-    auto lock = getLock();
+    std::lock_guard lock(query_factories_info.mutex);
 
     switch (factory_type)
     {
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index ddc474ca347..1cfbb1b1ec0 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -291,6 +291,43 @@ private:
     /// Record names of created objects of factories (for testing, etc)
     struct QueryFactoriesInfo
     {
+        QueryFactoriesInfo() = default;
+
+        QueryFactoriesInfo(const QueryFactoriesInfo & rhs)
+        {
+            std::lock_guard<std::mutex> lock(rhs.mutex);
+            aggregate_functions = rhs.aggregate_functions;
+            aggregate_function_combinators = rhs.aggregate_function_combinators;
+            database_engines = rhs.database_engines;
+            data_type_families = rhs.data_type_families;
+            dictionaries = rhs.dictionaries;
+            formats = rhs.formats;
+            functions = rhs.functions;
+            storages = rhs.storages;
+            table_functions = rhs.table_functions;
+        }
+
+        QueryFactoriesInfo(QueryFactoriesInfo && rhs) = delete;
+
+        QueryFactoriesInfo & operator=(QueryFactoriesInfo rhs)
+        {
+            swap(rhs);
+            return *this;
+        }
+
+        void swap(QueryFactoriesInfo & rhs)
+        {
+            std::swap(aggregate_functions, rhs.aggregate_functions);
+            std::swap(aggregate_function_combinators, rhs.aggregate_function_combinators);
+            std::swap(database_engines, rhs.database_engines);
+            std::swap(data_type_families, rhs.data_type_families);
+            std::swap(dictionaries, rhs.dictionaries);
+            std::swap(formats, rhs.formats);
+            std::swap(functions, rhs.functions);
+            std::swap(storages, rhs.storages);
+            std::swap(table_functions, rhs.table_functions);
+        }
+
         std::unordered_set<std::string> aggregate_functions;
         std::unordered_set<std::string> aggregate_function_combinators;
         std::unordered_set<std::string> database_engines;
@@ -300,9 +337,11 @@ private:
         std::unordered_set<std::string> functions;
         std::unordered_set<std::string> storages;
         std::unordered_set<std::string> table_functions;
+
+        mutable std::mutex mutex;
     };
 
-    /// Needs to be chandged while having const context in factories methods
+    /// Needs to be changed while having const context in factories methods
     mutable QueryFactoriesInfo query_factories_info;
 
     /// TODO: maybe replace with temporary tables?
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 267564eb84c..2589df0986a 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -647,7 +647,7 @@ std::unique_lock<std::shared_mutex> DatabaseCatalog::getExclusiveDDLGuardForData
     {
         std::unique_lock lock(ddl_guards_mutex);
         db_guard_iter = ddl_guards.try_emplace(database).first;
-        assert(db_guard_iter->second.first.count(""));
+        assert(db_guard_iter->second.first.contains(""));
     }
     DatabaseGuard & db_guard = db_guard_iter->second;
     return std::unique_lock{db_guard.second};
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 0b1154f6fd1..699f73abd67 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -43,10 +43,13 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Core/ColumnNumbers.h>
+#include <Core/Names.h>
 #include <Core/NamesAndTypes.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeFixedString.h>
 
 #include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/GetAggregatesVisitor.h>
@@ -325,12 +328,21 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
     {
         if (ASTPtr group_by_ast = select_query->groupBy())
         {
-            NameSet unique_keys;
+            NameToIndexMap unique_keys;
             ASTs & group_asts = group_by_ast->children;
 
+            if (select_query->group_by_with_rollup)
+                group_by_kind = GroupByKind::ROLLUP;
+            else if (select_query->group_by_with_cube)
+                group_by_kind = GroupByKind::CUBE;
+            else if (select_query->group_by_with_grouping_sets && group_asts.size() > 1)
+                group_by_kind = GroupByKind::GROUPING_SETS;
+            else
+                group_by_kind = GroupByKind::ORDINARY;
+
             /// 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)
+            if (group_by_kind != GroupByKind::ORDINARY)
                 aggregated_columns.emplace_back("__grouping_set", std::make_shared<DataTypeUInt64>());
 
             for (ssize_t i = 0; i < static_cast<ssize_t>(group_asts.size()); ++i)
@@ -347,6 +359,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                     group_elements_ast = group_ast_element->children;
 
                     NamesAndTypesList grouping_set_list;
+                    ColumnNumbers grouping_set_indexes_list;
 
                     for (ssize_t j = 0; j < ssize_t(group_elements_ast.size()); ++j)
                     {
@@ -387,15 +400,21 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                         /// Aggregation keys are unique.
                         if (!unique_keys.contains(key.name))
                         {
-                            unique_keys.insert(key.name);
+                            unique_keys[key.name] = aggregation_keys.size();
+                            grouping_set_indexes_list.push_back(aggregation_keys.size());
                             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));
                         }
+                        else
+                        {
+                            grouping_set_indexes_list.push_back(unique_keys[key.name]);
+                        }
                     }
 
                     aggregation_keys_list.push_back(std::move(grouping_set_list));
+                    aggregation_keys_indexes_list.push_back(std::move(grouping_set_indexes_list));
                 }
                 else
                 {
@@ -433,7 +452,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                     /// Aggregation keys are uniqued.
                     if (!unique_keys.contains(key.name))
                     {
-                        unique_keys.insert(key.name);
+                        unique_keys[key.name] = aggregation_keys.size();
                         aggregation_keys.push_back(key);
 
                         /// Key is no longer needed, therefore we can save a little by moving it.
@@ -442,6 +461,13 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                 }
             }
 
+            if (!select_query->group_by_with_grouping_sets)
+            {
+                auto & list = aggregation_keys_indexes_list.emplace_back();
+                for (size_t i = 0; i < aggregation_keys.size(); ++i)
+                    list.push_back(i);
+            }
+
             if (group_asts.empty())
             {
                 select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
@@ -583,7 +609,8 @@ void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_makeset_for_
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
-        !isRemoteStorage() /* create_source_for_in */);
+        !isRemoteStorage() /* create_source_for_in */,
+        getAggregationKeysInfo());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
     actions = visitor_data.getActions();
 }
@@ -603,7 +630,8 @@ void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, ActionsDAGP
         true /* no_makeset_for_subqueries, no_makeset implies no_makeset_for_subqueries */,
         true /* no_makeset */,
         only_consts,
-        !isRemoteStorage() /* create_source_for_in */);
+        !isRemoteStorage() /* create_source_for_in */,
+        getAggregationKeysInfo());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
     actions = visitor_data.getActions();
 }
@@ -624,7 +652,8 @@ void ExpressionAnalyzer::getRootActionsForHaving(
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
-        true /* create_source_for_in */);
+        true /* create_source_for_in */,
+        getAggregationKeysInfo());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
     actions = visitor_data.getActions();
 }
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 85efb3829d0..80c664832e5 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <Core/ColumnNumbers.h>
 #include <Columns/FilterDescription.h>
+#include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/AggregateDescription.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/SubqueryForSet.h>
@@ -67,6 +69,7 @@ struct ExpressionAnalyzerData
     bool has_aggregation = false;
     NamesAndTypesList aggregation_keys;
     NamesAndTypesLists aggregation_keys_list;
+    ColumnNumbersList aggregation_keys_indexes_list;
     bool has_const_aggregation_keys = false;
     AggregateDescriptions aggregate_descriptions;
 
@@ -77,6 +80,8 @@ struct ExpressionAnalyzerData
 
     /// All new temporary tables obtained by performing the GLOBAL IN/JOIN subqueries.
     TemporaryTablesMapping external_tables;
+
+    GroupByKind group_by_kind = GroupByKind::NONE;
 };
 
 
@@ -200,6 +205,11 @@ protected:
 
     NamesAndTypesList getColumnsAfterArrayJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
     NamesAndTypesList analyzeJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
+
+    AggregationKeysInfo getAggregationKeysInfo() const noexcept
+    {
+      return { aggregation_keys, aggregation_keys_indexes_list, group_by_kind };
+    }
 };
 
 class SelectQueryExpressionAnalyzer;
@@ -326,7 +336,15 @@ public:
     bool hasGlobalSubqueries() { return has_global_subqueries; }
     bool hasTableJoin() const { return syntax->ast_join; }
 
-    bool useGroupingSetKey() const { return aggregation_keys_list.size() > 1; }
+    /// When there is only one group in GROUPING SETS
+    /// it is a special case that is equal to GROUP BY, i.e.:
+    ///
+    ///     GROUPING SETS ((a, b)) -> GROUP BY a, b
+    ///
+    /// But it is rewritten by GroupingSetsRewriterVisitor to GROUP BY,
+    /// so instead of aggregation_keys_list.size() > 1,
+    /// !aggregation_keys_list.empty() can be used.
+    bool useGroupingSetKey() const { return !aggregation_keys_list.empty(); }
 
     const NamesAndTypesList & aggregationKeys() const { return aggregation_keys; }
     bool hasConstAggregationKeys() const { return has_const_aggregation_keys; }
diff --git a/src/Interpreters/GroupingSetsRewriterVisitor.cpp b/src/Interpreters/GroupingSetsRewriterVisitor.cpp
new file mode 100644
index 00000000000..e5b930376cd
--- /dev/null
+++ b/src/Interpreters/GroupingSetsRewriterVisitor.cpp
@@ -0,0 +1,22 @@
+#include <Interpreters/GroupingSetsRewriterVisitor.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTExpressionList.h>
+
+
+namespace DB
+{
+
+void GroupingSetsRewriterData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    const ASTPtr group_by = select_query.groupBy();
+    if (!group_by || !select_query.group_by_with_grouping_sets)
+        return;
+
+    if (group_by->children.size() != 1)
+        return;
+
+    select_query.setExpression(ASTSelectQuery::Expression::GROUP_BY, std::move(group_by->children.front()));
+    select_query.group_by_with_grouping_sets = false;
+}
+
+}
diff --git a/src/Interpreters/GroupingSetsRewriterVisitor.h b/src/Interpreters/GroupingSetsRewriterVisitor.h
new file mode 100644
index 00000000000..3d56bf1917d
--- /dev/null
+++ b/src/Interpreters/GroupingSetsRewriterVisitor.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTSelectQuery;
+
+/// Rewrite GROUPING SETS with only one group, to GROUP BY.
+///
+/// Examples:
+/// - GROUPING SETS (foo) -> GROUP BY foo
+/// - GROUPING SETS ((foo, bar)) -> GROUP BY foo, bar
+///
+/// But not the following:
+/// - GROUPING SETS (foo, bar) (since it has two groups (foo) and (bar))
+class GroupingSetsRewriterData
+{
+public:
+    using TypeToVisit = ASTSelectQuery;
+
+    static void visit(ASTSelectQuery & select_query, ASTPtr &);
+};
+
+using GroupingSetsRewriterMatcher = OneTypeMatcher<GroupingSetsRewriterData>;
+using GroupingSetsRewriterVisitor = InDepthNodeVisitor<GroupingSetsRewriterMatcher, true>;
+
+}
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index b58059312bd..521fbe139e7 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -707,6 +707,13 @@ namespace
 
 void HashJoin::initRightBlockStructure(Block & saved_block_sample)
 {
+    if (isCrossOrComma(kind))
+    {
+        /// cross join doesn't have keys, just add all columns
+        saved_block_sample = sample_block_with_columns_to_add.cloneEmpty();
+        return;
+    }
+
     bool multiple_disjuncts = !table_join->oneDisjunct();
     /// We could remove key columns for LEFT | INNER HashJoin but we should keep them for JoinSwitcher (if any).
     bool save_key_columns = !table_join->forceHashJoin() || isRightOrFull(kind) || multiple_disjuncts;
@@ -724,9 +731,7 @@ void HashJoin::initRightBlockStructure(Block & saved_block_sample)
     for (auto & column : sample_block_with_columns_to_add)
     {
         if (!saved_block_sample.findByName(column.name))
-        {
             saved_block_sample.insert(column);
-        }
     }
 }
 
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index d143295181e..13f721362cc 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -1098,6 +1098,9 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
     if (query.group_by_with_grouping_sets && (query.group_by_with_rollup || query.group_by_with_cube))
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "GROUPING SETS are not supported together with ROLLUP and CUBE");
 
+    if (expressions.hasHaving() && query.group_by_with_totals && (query.group_by_with_rollup || query.group_by_with_cube))
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "WITH TOTALS and WITH ROLLUP or CUBE are not supported together in presence of HAVING");
+
     if (query_info.projection && query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
     {
         query_info.projection->aggregate_overflow_row = aggregate_overflow_row;
@@ -1386,11 +1389,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                         executeRollupOrCube(query_plan, Modificator::CUBE);
 
                     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 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);
@@ -2060,12 +2059,15 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         if (prewhere_info)
             query_info.prewhere_info = prewhere_info;
 
+        bool optimize_read_in_order = analysis_result.optimize_read_in_order;
+        bool optimize_aggregation_in_order = analysis_result.optimize_aggregation_in_order && !query_analyzer->useGroupingSetKey();
+
         /// Create optimizer with prepared actions.
         /// Maybe we will need to calc input_order_info later, e.g. while reading from StorageMerge.
-        if ((analysis_result.optimize_read_in_order || analysis_result.optimize_aggregation_in_order)
+        if ((optimize_read_in_order || optimize_aggregation_in_order)
             && (!query_info.projection || query_info.projection->complete))
         {
-            if (analysis_result.optimize_read_in_order)
+            if (optimize_read_in_order)
             {
                 if (query_info.projection)
                 {
@@ -2291,7 +2293,7 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
 
     SortDescription group_by_sort_description;
 
-    if (group_by_info && settings.optimize_aggregation_in_order)
+    if (group_by_info && settings.optimize_aggregation_in_order && !query_analyzer->useGroupingSetKey())
         group_by_sort_description = getSortDescriptionFromGroupBy(getSelectQuery());
     else
         group_by_info = nullptr;
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index 7506c3013cb..94ebfd73513 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -46,6 +46,10 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
     if (!num_children)
         throw Exception("Logical error: no children in ASTSelectWithUnionQuery", ErrorCodes::LOGICAL_ERROR);
 
+    /// This is required for UNION to match headers correctly.
+    if (num_children > 1)
+        options.reorderColumns();
+
     /// Note that we pass 'required_result_column_names' to first SELECT.
     /// And for the rest, we pass names at the corresponding positions of 'required_result_column_names' in the result of first SELECT,
     ///  because names could be different.
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 0db6f353cf4..c4b7fa135da 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -35,6 +35,7 @@
 #include <Interpreters/TransactionsInfoLog.h>
 #include <Interpreters/ProcessorsProfileLog.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
+#include <Interpreters/TransactionLog.h>
 #include <Access/ContextAccess.h>
 #include <Access/Common/AllowedClientHosts.h>
 #include <Databases/IDatabase.h>
@@ -442,6 +443,9 @@ BlockIO InterpreterSystemQuery::execute()
         case Type::SYNC_DATABASE_REPLICA:
             syncReplicatedDatabase(query);
             break;
+        case Type::SYNC_TRANSACTION_LOG:
+            syncTransactionLog();
+            break;
         case Type::FLUSH_DISTRIBUTED:
             flushDistributed(query);
             break;
@@ -763,6 +767,13 @@ void InterpreterSystemQuery::syncReplicatedDatabase(ASTSystemQuery & query)
 }
 
 
+void InterpreterSystemQuery::syncTransactionLog()
+{
+    getContext()->checkTransactionsAreAllowed(/* explicit_tcl_query */ true);
+    TransactionLog::instance().sync();
+}
+
+
 void InterpreterSystemQuery::flushDistributed(ASTSystemQuery &)
 {
     getContext()->checkAccess(AccessType::SYSTEM_FLUSH_DISTRIBUTED, table_id);
@@ -780,7 +791,7 @@ void InterpreterSystemQuery::restartDisk(String & name)
     auto disk = getContext()->getDisk(name);
 
     if (DiskRestartProxy * restart_proxy = dynamic_cast<DiskRestartProxy*>(disk.get()))
-        restart_proxy->restart();
+        restart_proxy->restart(getContext());
     else
         throw Exception("Disk " + name + " doesn't have possibility to restart", ErrorCodes::BAD_ARGUMENTS);
 }
@@ -937,6 +948,11 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_SYNC_DATABASE_REPLICA, query.getDatabase());
             break;
         }
+        case Type::SYNC_TRANSACTION_LOG:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_SYNC_TRANSACTION_LOG);
+            break;
+        }
         case Type::FLUSH_DISTRIBUTED:
         {
             required_access.emplace_back(AccessType::SYSTEM_FLUSH_DISTRIBUTED, query.getDatabase(), query.getTable());
diff --git a/src/Interpreters/InterpreterSystemQuery.h b/src/Interpreters/InterpreterSystemQuery.h
index b5a80f0e19c..f07f18489f0 100644
--- a/src/Interpreters/InterpreterSystemQuery.h
+++ b/src/Interpreters/InterpreterSystemQuery.h
@@ -53,6 +53,8 @@ private:
 
     void syncReplicatedDatabase(ASTSystemQuery & query);
 
+    void syncTransactionLog();
+
     void restoreReplica();
 
     void dropReplica(ASTSystemQuery & query);
diff --git a/src/Interpreters/PartLog.cpp b/src/Interpreters/PartLog.cpp
index ce9aa0c03d1..6d57f6b7045 100644
--- a/src/Interpreters/PartLog.cpp
+++ b/src/Interpreters/PartLog.cpp
@@ -46,6 +46,7 @@ NamesAndTypesList PartLogElement::getNamesAndTypes()
         {"table", std::make_shared<DataTypeString>()},
         {"part_name", std::make_shared<DataTypeString>()},
         {"partition_id", std::make_shared<DataTypeString>()},
+        {"part_type", std::make_shared<DataTypeString>()},
         {"disk_name", std::make_shared<DataTypeString>()},
         {"path_on_disk", std::make_shared<DataTypeString>()},
 
@@ -80,6 +81,7 @@ void PartLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(table_name);
     columns[i++]->insert(part_name);
     columns[i++]->insert(partition_id);
+    columns[i++]->insert(part_type.toString());
     columns[i++]->insert(disk_name);
     columns[i++]->insert(path_on_disk);
 
@@ -159,6 +161,7 @@ bool PartLog::addNewParts(
             elem.part_name = part->name;
             elem.disk_name = part->volume->getDisk()->getName();
             elem.path_on_disk = part->getFullPath();
+            elem.part_type = part->getType();
 
             elem.bytes_compressed_on_disk = part->getBytesOnDisk();
             elem.rows = part->rows_count;
diff --git a/src/Interpreters/PartLog.h b/src/Interpreters/PartLog.h
index 7582f6fe9e6..470dce09fa0 100644
--- a/src/Interpreters/PartLog.h
+++ b/src/Interpreters/PartLog.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Interpreters/SystemLog.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/NamesAndAliases.h>
@@ -35,6 +36,8 @@ struct PartLogElement
     String disk_name;
     String path_on_disk;
 
+    MergeTreeDataPartType part_type;
+
     /// Size of the part
     UInt64 rows = 0;
 
diff --git a/src/Interpreters/SelectQueryOptions.h b/src/Interpreters/SelectQueryOptions.h
index 31ed9d8c686..032befe1993 100644
--- a/src/Interpreters/SelectQueryOptions.h
+++ b/src/Interpreters/SelectQueryOptions.h
@@ -31,6 +31,8 @@ struct SelectQueryOptions
     bool only_analyze = false;
     bool modify_inplace = false;
     bool remove_duplicates = false;
+    /// This is required for UNION to match headers correctly.
+    bool reorder_columns_as_required_header = false;
     bool ignore_quota = false;
     bool ignore_limits = false;
     /// This flag is needed to analyze query ignoring table projections.
@@ -97,6 +99,12 @@ struct SelectQueryOptions
         return *this;
     }
 
+    SelectQueryOptions & reorderColumns(bool value = true)
+    {
+        reorder_columns_as_required_header = value;
+        return *this;
+    }
+
     SelectQueryOptions & noSubquery()
     {
         subquery_depth = 0;
@@ -127,7 +135,7 @@ struct SelectQueryOptions
         return *this;
     }
 
-    SelectQueryOptions & ignoreASTOptimizationsAlias(bool value = true)
+    SelectQueryOptions & ignoreASTOptimizations(bool value = true)
     {
         ignore_ast_optimizations = value;
         return *this;
diff --git a/src/Interpreters/TransactionLog.cpp b/src/Interpreters/TransactionLog.cpp
index 4f0e79297b8..5eab70f9e2a 100644
--- a/src/Interpreters/TransactionLog.cpp
+++ b/src/Interpreters/TransactionLog.cpp
@@ -217,7 +217,7 @@ void TransactionLog::runUpdatingThread()
         try
         {
             /// Do not wait if we have some transactions to finalize
-            if (!unknown_state_list_loaded.empty())
+            if (unknown_state_list_loaded.empty())
                 log_updated_event->wait();
 
             if (stop_flag.load())
@@ -597,4 +597,14 @@ TransactionLog::TransactionsList TransactionLog::getTransactionsList() const
     return running_list;
 }
 
+
+void TransactionLog::sync() const
+{
+    Strings entries_list = zookeeper->getChildren(zookeeper_path_log);
+    chassert(!entries_list.empty());
+    std::sort(entries_list.begin(), entries_list.end());
+    CSN newest_csn = deserializeCSN(entries_list.back());
+    waitForCSNLoaded(newest_csn);
+}
+
 }
diff --git a/src/Interpreters/TransactionLog.h b/src/Interpreters/TransactionLog.h
index a0268ce9b88..49aa77b9868 100644
--- a/src/Interpreters/TransactionLog.h
+++ b/src/Interpreters/TransactionLog.h
@@ -126,6 +126,8 @@ public:
 
     bool isShuttingDown() const { return stop_flag.load(); }
 
+    void sync() const;
+
 private:
     void loadLogFromZooKeeper();
     void runUpdatingThread();
diff --git a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
index 35fb0828b3e..3129f9d7fe2 100644
--- a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
+++ b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
@@ -253,7 +253,7 @@ void TranslateQualifiedNamesMatcher::visit(ASTExpressionList & node, const ASTPt
             {
                 for (const auto & column : table.columns)
                 {
-                    if (asterisk_regexp_pattern->isColumnMatching(column.name) && (first_table || !data.join_using_columns.count(column.name)))
+                    if (asterisk_regexp_pattern->isColumnMatching(column.name) && (first_table || !data.join_using_columns.contains(column.name)))
                     {
                         addIdentifier(columns, table.table, column.name);
                     }
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 537c18beaa1..42628fbb905 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -459,11 +459,26 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     std::unordered_set<String> group_by_hashes;
     if (auto group_by = select_query->groupBy())
     {
-        for (auto & elem : group_by->children)
+        if (select_query->group_by_with_grouping_sets)
         {
-            auto hash = elem->getTreeHash();
-            String key = toString(hash.first) + '_' + toString(hash.second);
-            group_by_hashes.insert(key);
+            for (auto & set : group_by->children)
+            {
+                for (auto & elem : set->children)
+                {
+                    auto hash = elem->getTreeHash();
+                    String key = toString(hash.first) + '_' + toString(hash.second);
+                    group_by_hashes.insert(key);
+                }
+            }
+        }
+        else
+        {
+            for (auto & elem : group_by->children)
+            {
+                auto hash = elem->getTreeHash();
+                String key = toString(hash.first) + '_' + toString(hash.second);
+                group_by_hashes.insert(key);
+            }
         }
     }
 
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index c90421d6f4f..fac70e862d4 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -13,6 +13,7 @@
 #include <Interpreters/FunctionNameNormalizer.h>
 #include <Interpreters/MarkTableIdentifiersVisitor.h>
 #include <Interpreters/QueryNormalizer.h>
+#include <Interpreters/GroupingSetsRewriterVisitor.h>
 #include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
@@ -65,6 +66,12 @@ namespace
 
 using LogAST = DebugASTLog<false>; /// set to true to enable logs
 
+void optimizeGroupingSets(ASTPtr & query)
+{
+    GroupingSetsRewriterVisitor::Data data;
+    GroupingSetsRewriterVisitor(data).visit(query);
+}
+
 /// Select implementation of a function based on settings.
 /// Important that it is done as query rewrite. It means rewritten query
 ///  will be sent to remote servers during distributed query execution,
@@ -422,7 +429,7 @@ void renameDuplicatedColumns(const ASTSelectQuery * select_query)
 /// This is the case when we have DISTINCT or arrayJoin: we require more columns in SELECT even if we need less columns in result.
 /// Also we have to remove duplicates in case of GLOBAL subqueries. Their results are placed into tables so duplicates are impossible.
 /// Also remove all INTERPOLATE columns which are not in SELECT anymore.
-void removeUnneededColumnsFromSelectClause(ASTSelectQuery * select_query, const Names & required_result_columns, bool remove_dups)
+void removeUnneededColumnsFromSelectClause(ASTSelectQuery * select_query, const Names & required_result_columns, bool remove_dups, bool reorder_columns_as_required_header)
 {
     ASTs & elements = select_query->select()->children;
 
@@ -453,6 +460,29 @@ void removeUnneededColumnsFromSelectClause(ASTSelectQuery * select_query, const
 
     NameSet remove_columns;
 
+    /// Resort columns according to required_result_columns.
+    if (reorder_columns_as_required_header && !required_result_columns.empty())
+    {
+        std::unordered_map<String, size_t> name_pos;
+        {
+            size_t pos = 0;
+            for (const auto & name : required_result_columns)
+                name_pos[name] = pos++;
+        }
+        std::sort(elements.begin(), elements.end(), [&](const auto & lhs, const auto & rhs)
+        {
+            String lhs_name = lhs->getAliasOrColumnName();
+            String rhs_name = rhs->getAliasOrColumnName();
+            size_t lhs_pos = name_pos.size();
+            size_t rhs_pos = name_pos.size();
+            if (auto it = name_pos.find(lhs_name); it != name_pos.end())
+                lhs_pos = it->second;
+            if (auto it = name_pos.find(rhs_name); it != name_pos.end())
+                rhs_pos = it->second;
+            return lhs_pos < rhs_pos;
+        });
+    }
+
     for (const auto & elem : elements)
     {
         String name = elem->getAliasOrColumnName();
@@ -465,6 +495,8 @@ void removeUnneededColumnsFromSelectClause(ASTSelectQuery * select_query, const
         }
         else if (select_query->distinct || hasArrayJoin(elem))
         {
+            /// ARRAY JOIN cannot be optimized out since it may change number of rows,
+            /// so as DISTINCT.
             new_elements.push_back(elem);
         }
         else
@@ -1135,6 +1167,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     size_t subquery_depth = select_options.subquery_depth;
     bool remove_duplicates = select_options.remove_duplicates;
+    bool reorder_columns_as_required_header = select_options.reorder_columns_as_required_header;
 
     const auto & settings = getContext()->getSettingsRef();
 
@@ -1151,7 +1184,7 @@ 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
+    /// Perform it before analyzing JOINs, because it may change number of columns with names unique and break some logic inside JOINs
     if (settings.optimize_normalize_count_variants)
         TreeOptimizer::optimizeCountConstantAndSumOne(query);
 
@@ -1186,7 +1219,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)
     ///  and before 'executeScalarSubqueries', 'analyzeAggregation', etc. to avoid excessive calculations.
-    removeUnneededColumnsFromSelectClause(select_query, required_result_columns, remove_duplicates);
+    removeUnneededColumnsFromSelectClause(select_query, required_result_columns, remove_duplicates, reorder_columns_as_required_header);
 
     /// Executing scalar subqueries - replacing them with constant values.
     executeScalarSubqueries(query, getContext(), subquery_depth, result.scalars, result.local_scalars, select_options.only_analyze);
@@ -1373,6 +1406,8 @@ void TreeRewriter::normalize(
     /// Common subexpression elimination. Rewrite rules.
     QueryNormalizer::Data normalizer_data(aliases, source_columns_set, ignore_alias, settings, allow_self_aliases);
     QueryNormalizer(normalizer_data).visit(query);
+
+    optimizeGroupingSets(query);
 }
 
 }
diff --git a/src/Parsers/ASTDictionaryAttributeDeclaration.cpp b/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
index e9c50839a98..760b96b0927 100644
--- a/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
+++ b/src/Parsers/ASTDictionaryAttributeDeclaration.cpp
@@ -58,6 +58,9 @@ void ASTDictionaryAttributeDeclaration::formatImpl(const FormatSettings & settin
     if (hierarchical)
         settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "HIERARCHICAL";
 
+    if (bidirectional)
+        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "BIDIRECTIONAL";
+
     if (injective)
         settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "INJECTIVE";
 
diff --git a/src/Parsers/ASTDictionaryAttributeDeclaration.h b/src/Parsers/ASTDictionaryAttributeDeclaration.h
index b34ebc539ec..b6572e89d16 100644
--- a/src/Parsers/ASTDictionaryAttributeDeclaration.h
+++ b/src/Parsers/ASTDictionaryAttributeDeclaration.h
@@ -20,6 +20,8 @@ public:
     ASTPtr expression;
     /// Is attribute mirrored to the parent identifier
     bool hierarchical;
+    /// Is hierarchical attribute bidirectional
+    bool bidirectional;
     /// Flag that shows whether the id->attribute image is injective
     bool injective;
     /// MongoDB object ID
diff --git a/src/Parsers/ASTSelectQuery.h b/src/Parsers/ASTSelectQuery.h
index 704aeeeea7c..084627b57a1 100644
--- a/src/Parsers/ASTSelectQuery.h
+++ b/src/Parsers/ASTSelectQuery.h
@@ -95,22 +95,22 @@ public:
     ASTPtr & refWhere()     { return getExpression(Expression::WHERE); }
     ASTPtr & refHaving()    { return getExpression(Expression::HAVING); }
 
-    const ASTPtr with()           const { return getExpression(Expression::WITH); }
-    const ASTPtr select()         const { return getExpression(Expression::SELECT); }
-    const ASTPtr tables()         const { return getExpression(Expression::TABLES); }
-    const ASTPtr prewhere()       const { return getExpression(Expression::PREWHERE); }
-    const ASTPtr where()          const { return getExpression(Expression::WHERE); }
-    const ASTPtr groupBy()        const { return getExpression(Expression::GROUP_BY); }
-    const ASTPtr having()         const { return getExpression(Expression::HAVING); }
-    const ASTPtr window()         const { return getExpression(Expression::WINDOW); }
-    const ASTPtr orderBy()        const { return getExpression(Expression::ORDER_BY); }
-    const ASTPtr limitByOffset()  const { return getExpression(Expression::LIMIT_BY_OFFSET); }
-    const ASTPtr limitByLength()  const { return getExpression(Expression::LIMIT_BY_LENGTH); }
-    const ASTPtr limitBy()        const { return getExpression(Expression::LIMIT_BY); }
-    const ASTPtr limitOffset()    const { return getExpression(Expression::LIMIT_OFFSET); }
-    const ASTPtr limitLength()    const { return getExpression(Expression::LIMIT_LENGTH); }
-    const ASTPtr settings()       const { return getExpression(Expression::SETTINGS); }
-    const ASTPtr interpolate()    const { return getExpression(Expression::INTERPOLATE); }
+    ASTPtr with()           const { return getExpression(Expression::WITH); }
+    ASTPtr select()         const { return getExpression(Expression::SELECT); }
+    ASTPtr tables()         const { return getExpression(Expression::TABLES); }
+    ASTPtr prewhere()       const { return getExpression(Expression::PREWHERE); }
+    ASTPtr where()          const { return getExpression(Expression::WHERE); }
+    ASTPtr groupBy()        const { return getExpression(Expression::GROUP_BY); }
+    ASTPtr having()         const { return getExpression(Expression::HAVING); }
+    ASTPtr window()         const { return getExpression(Expression::WINDOW); }
+    ASTPtr orderBy()        const { return getExpression(Expression::ORDER_BY); }
+    ASTPtr limitByOffset()  const { return getExpression(Expression::LIMIT_BY_OFFSET); }
+    ASTPtr limitByLength()  const { return getExpression(Expression::LIMIT_BY_LENGTH); }
+    ASTPtr limitBy()        const { return getExpression(Expression::LIMIT_BY); }
+    ASTPtr limitOffset()    const { return getExpression(Expression::LIMIT_OFFSET); }
+    ASTPtr limitLength()    const { return getExpression(Expression::LIMIT_LENGTH); }
+    ASTPtr settings()       const { return getExpression(Expression::SETTINGS); }
+    ASTPtr interpolate()    const { return getExpression(Expression::INTERPOLATE); }
 
     bool hasFiltration() const { return where() || prewhere() || having(); }
 
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index eff71a3a9a0..27973691d9d 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -37,6 +37,7 @@ public:
         DROP_REPLICA,
         SYNC_REPLICA,
         SYNC_DATABASE_REPLICA,
+        SYNC_TRANSACTION_LOG,
         RELOAD_DICTIONARY,
         RELOAD_DICTIONARIES,
         RELOAD_MODEL,
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 633b8c2e35a..822bdf8d72a 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -803,6 +803,20 @@ namespace
         node = makeASTFunction("exists", subquery);
         return true;
     }
+
+    bool parseGrouping(IParser::Pos & pos, ASTPtr & node, Expected & expected)
+    {
+        ASTPtr expr_list;
+        if (!ParserExpressionList(false, false).parse(pos, expr_list, expected))
+            return false;
+
+        auto res = std::make_shared<ASTFunction>();
+        res->name = "grouping";
+        res->arguments = expr_list;
+        res->children.push_back(res->arguments);
+        node = std::move(res);
+        return true;
+    }
 }
 
 
@@ -888,6 +902,8 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     else if (function_name_lowercase == "datediff" || function_name_lowercase == "date_diff"
         || function_name_lowercase == "timestampdiff" || function_name_lowercase == "timestamp_diff")
         parsed_special_function = parseDateDiff(pos, node, expected);
+    else if (function_name_lowercase == "grouping")
+        parsed_special_function = parseGrouping(pos, node, expected);
 
     if (parsed_special_function.has_value())
         return parsed_special_function.value() && ParserToken(TokenType::ClosingRoundBracket).ignore(pos);
diff --git a/src/Parsers/ParserDictionaryAttributeDeclaration.cpp b/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
index a248c9def07..44bb7fb6057 100644
--- a/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
+++ b/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
@@ -15,6 +15,7 @@ bool ParserDictionaryAttributeDeclaration::parseImpl(Pos & pos, ASTPtr & node, E
     ParserKeyword s_default{"DEFAULT"};
     ParserKeyword s_expression{"EXPRESSION"};
     ParserKeyword s_hierarchical{"HIERARCHICAL"};
+    ParserKeyword s_bidirectional{"BIDIRECTIONAL"};
     ParserKeyword s_injective{"INJECTIVE"};
     ParserKeyword s_is_object_id{"IS_OBJECT_ID"};
     ParserLiteral default_parser;
@@ -30,6 +31,7 @@ bool ParserDictionaryAttributeDeclaration::parseImpl(Pos & pos, ASTPtr & node, E
     ASTPtr default_value;
     ASTPtr expression;
     bool hierarchical = false;
+    bool bidirectional = false;
     bool injective = false;
     bool is_object_id = false;
 
@@ -63,6 +65,12 @@ bool ParserDictionaryAttributeDeclaration::parseImpl(Pos & pos, ASTPtr & node, E
             continue;
         }
 
+        if (!bidirectional && s_bidirectional.ignore(pos, expected))
+        {
+            bidirectional = true;
+            continue;
+        }
+
         if (!injective && s_injective.ignore(pos, expected))
         {
             injective = true;
@@ -101,6 +109,7 @@ bool ParserDictionaryAttributeDeclaration::parseImpl(Pos & pos, ASTPtr & node, E
     }
 
     attribute_declaration->hierarchical = hierarchical;
+    attribute_declaration->bidirectional = bidirectional;
     attribute_declaration->injective = injective;
     attribute_declaration->is_object_id = is_object_id;
 
diff --git a/src/Processors/Executors/PollingQueue.cpp b/src/Processors/Executors/PollingQueue.cpp
index a601d426a5d..270f495a2f0 100644
--- a/src/Processors/Executors/PollingQueue.cpp
+++ b/src/Processors/Executors/PollingQueue.cpp
@@ -38,7 +38,7 @@ PollingQueue::~PollingQueue()
 void PollingQueue::addTask(size_t thread_number, void * data, int fd)
 {
     std::uintptr_t key = reinterpret_cast<uintptr_t>(data);
-    if (tasks.count(key))
+    if (tasks.contains(key))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Task {} was already added to task queue", key);
 
     tasks[key] = TaskData{thread_number, data, fd};
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index 0eaa02c97cb..bddd4203a5d 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -259,6 +259,12 @@ bool CSVFormatReader::readField(
     }
 }
 
+void CSVFormatReader::skipPrefixBeforeHeader()
+{
+    for (size_t i = 0; i != format_settings.csv.skip_first_lines; ++i)
+        readRow();
+}
+
 
 CSVSchemaReader::CSVSchemaReader(ReadBuffer & in_, bool with_names_, bool with_types_, const FormatSettings & format_setting_)
     : FormatWithNamesAndTypesSchemaReader(
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.h b/src/Processors/Formats/Impl/CSVRowInputFormat.h
index 91a872378c8..20a92c07830 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.h
@@ -58,6 +58,7 @@ public:
     void skipTypes() override { skipHeaderRow(); }
     void skipFieldDelimiter() override;
     void skipRowEndDelimiter() override;
+    void skipPrefixBeforeHeader() override;
 
     std::vector<String> readNames() override { return readHeaderRow(); }
     std::vector<String> readTypes() override { return readHeaderRow(); }
diff --git a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
index 3d0a02c99e8..a0af124edce 100644
--- a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
@@ -5,6 +5,7 @@
 
 #include <base/defines.h>
 #include <base/types.h>
+#include <base/sort.h>
 
 #include <Columns/ColumnMap.h>
 #include <Columns/IColumn.h>
@@ -107,17 +108,25 @@ void PrometheusTextOutputFormat::fixupBucketLabels(CurrentMetric & metric)
 {
     String bucket_label = metric.type == "histogram" ? "le" : "quantile";
 
-    std::sort(metric.values.begin(), metric.values.end(),
+    ::sort(metric.values.begin(), metric.values.end(),
         [&bucket_label](const auto & lhs, const auto & rhs)
         {
+            bool lhs_labels_contain_sum = lhs.labels.contains("sum");
+            bool lhs_labels_contain_count = lhs.labels.contains("count");
+            bool lhs_labels_contain_sum_or_count = lhs_labels_contain_sum || lhs_labels_contain_count;
+
+            bool rhs_labels_contain_sum = rhs.labels.contains("sum");
+            bool rhs_labels_contain_count = rhs.labels.contains("count");
+            bool rhs_labels_contain_sum_or_count = rhs_labels_contain_sum || rhs_labels_contain_count;
+
             /// rows with labels at the beginning and then `_sum` and `_count`
-            if (lhs.labels.contains("sum") && rhs.labels.contains("count"))
+            if (lhs_labels_contain_sum && rhs_labels_contain_count)
                 return true;
-            if (lhs.labels.contains("count") && rhs.labels.contains("sum"))
+            else if (lhs_labels_contain_count && rhs_labels_contain_sum)
                 return false;
-            if (rhs.labels.contains("sum") || rhs.labels.contains("count"))
+            else if (rhs_labels_contain_sum_or_count && !lhs_labels_contain_sum_or_count)
                 return true;
-            if (lhs.labels.contains("sum") || lhs.labels.contains("count"))
+            else if (lhs_labels_contain_sum_or_count && !rhs_labels_contain_sum_or_count)
                 return false;
 
             auto lit = lhs.labels.find(bucket_label);
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
index 0be8257f463..877ba224fd5 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
@@ -230,6 +230,12 @@ void TabSeparatedFormatReader::checkNullValueForNonNullable(DataTypePtr type)
     }
 }
 
+void TabSeparatedFormatReader::skipPrefixBeforeHeader()
+{
+    for (size_t i = 0; i != format_settings.csv.skip_first_lines; ++i)
+        readRow();
+}
+
 void TabSeparatedRowInputFormat::syncAfterError()
 {
     skipToUnescapedNextLineOrEOF(*in);
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
index abab5b02c96..3476b974c3b 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
@@ -43,6 +43,7 @@ public:
     void skipTypes() override { skipHeaderRow(); }
     void skipFieldDelimiter() override;
     void skipRowEndDelimiter() override;
+    void skipPrefixBeforeHeader() override;
 
     std::vector<String> readRow();
     std::vector<String> readNames() override { return readRow(); }
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
index c5a72bf66bc..a744b2ae051 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
@@ -74,6 +74,8 @@ void MergingSortedAlgorithm::initialize(Inputs inputs)
 
     if (has_collation)
         queue_with_collation = SortingHeap<SortCursorWithCollation>(cursors);
+    else if (description.size() == 1)
+        queue_simple = SortingHeap<SimpleSortCursor>(cursors);
     else
         queue_without_collation = SortingHeap<SortCursor>(cursors);
 }
@@ -86,6 +88,8 @@ void MergingSortedAlgorithm::consume(Input & input, size_t source_num)
 
     if (has_collation)
         queue_with_collation.push(cursors[source_num]);
+    else if (description.size() == 1)
+        queue_simple.push(cursors[source_num]);
     else
         queue_without_collation.push(cursors[source_num]);
 }
@@ -94,6 +98,8 @@ IMergingAlgorithm::Status MergingSortedAlgorithm::merge()
 {
     if (has_collation)
         return mergeImpl(queue_with_collation);
+    else if (description.size() == 1)
+        return mergeImpl(queue_simple);
     else
         return mergeImpl(queue_without_collation);
 }
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
index cf3ec44f5fc..787bec7fca0 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.h
@@ -49,6 +49,7 @@ private:
 
     SortCursorImpls cursors;
 
+    SortingHeap<SimpleSortCursor> queue_simple;
     SortingHeap<SortCursor> queue_without_collation;
     SortingHeap<SortCursorWithCollation> queue_with_collation;
 
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index 50acc085257..4114eff5c56 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -12,7 +12,9 @@
 #include <Processors/Merges/FinishAggregatingInOrderTransform.h>
 #include <Interpreters/Aggregator.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <Columns/ColumnFixedString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeFixedString.h>
 
 namespace DB
 {
@@ -33,6 +35,17 @@ static ITransformingStep::Traits getTraits()
     };
 }
 
+Block appendGroupingSetColumn(Block header)
+{
+    Block res;
+    res.insert({std::make_shared<DataTypeUInt64>(), "__grouping_set"});
+
+    for (auto & col : header)
+        res.insert(std::move(col));
+
+    return res;
+}
+
 static Block appendGroupingColumn(Block block, const GroupingSetsParamsList & params)
 {
     if (params.empty())
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index b933daaa474..4dd3d956350 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -25,6 +25,8 @@ struct GroupingSetsParams
 
 using GroupingSetsParamsList = std::vector<GroupingSetsParams>;
 
+Block appendGroupingSetColumn(Block header);
+
 /// Aggregation. See AggregatingTransform.
 class AggregatingStep : public ITransformingStep
 {
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 23c5115ec68..91c85a08412 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -1,6 +1,9 @@
 #include <Processors/QueryPlan/CubeStep.h>
 #include <Processors/Transforms/CubeTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {
@@ -22,7 +25,8 @@ static ITransformingStep::Traits getTraits()
 }
 
 CubeStep::CubeStep(const DataStream & input_stream_, AggregatingTransformParamsPtr params_)
-    : ITransformingStep(input_stream_, params_->getHeader(), getTraits())
+    : ITransformingStep(input_stream_, appendGroupingSetColumn(params_->getHeader()), getTraits())
+    , keys_size(params_->params.keys_size)
     , params(std::move(params_))
 {
     /// Aggregation keys are distinct
@@ -30,14 +34,30 @@ CubeStep::CubeStep(const DataStream & input_stream_, AggregatingTransformParamsP
         output_stream->distinct_columns.insert(params->params.src_header.getByPosition(key).name);
 }
 
-void CubeStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+ProcessorPtr addGroupingSetForTotals(const Block & header, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number)
+{
+    auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
+
+    auto grouping_col = ColumnUInt64::create(1, grouping_set_number);
+    const auto * grouping_node = &dag->addColumn(
+        {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
+
+    grouping_node = &dag->materializeNode(*grouping_node);
+    auto & index = dag->getIndex();
+    index.insert(index.begin(), grouping_node);
+
+    auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
+    return std::make_shared<ExpressionTransform>(header, expression);
+}
+
+void CubeStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
     pipeline.resize(1);
 
     pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
         if (stream_type == QueryPipelineBuilder::StreamType::Totals)
-            return nullptr;
+            return addGroupingSetForTotals(header, settings, (UInt64(1) << keys_size) - 1);
 
         return std::make_shared<CubeTransform>(header, std::move(params));
     });
diff --git a/src/Processors/QueryPlan/CubeStep.h b/src/Processors/QueryPlan/CubeStep.h
index 1079bed5398..d3e26f9379f 100644
--- a/src/Processors/QueryPlan/CubeStep.h
+++ b/src/Processors/QueryPlan/CubeStep.h
@@ -21,6 +21,7 @@ public:
 
     const Aggregator::Params & getParams() const;
 private:
+    size_t keys_size;
     AggregatingTransformParamsPtr params;
 };
 
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
index ed9cdf547c2..854a677afb9 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
@@ -46,8 +46,15 @@ std::unique_ptr<QueryPlan> createLocalPlan(
     checkStackSize();
 
     auto query_plan = std::make_unique<QueryPlan>();
+    /// Do not apply AST optimizations, because query
+    /// is already optimized and some optimizations
+    /// can be applied only for non-distributed tables
+    /// and we can produce query, inconsistent with remote plans.
     auto interpreter = InterpreterSelectQuery(
-        query_ast, context, SelectQueryOptions(processed_stage).setShardInfo(shard_num, shard_count));
+        query_ast, context,
+        SelectQueryOptions(processed_stage)
+            .setShardInfo(shard_num, shard_count)
+            .ignoreASTOptimizations());
 
     interpreter.setProperClientInfo();
     if (coordinator)
diff --git a/src/Processors/QueryPlan/RollupStep.cpp b/src/Processors/QueryPlan/RollupStep.cpp
index acaeb2bc9a7..3b061f9c246 100644
--- a/src/Processors/QueryPlan/RollupStep.cpp
+++ b/src/Processors/QueryPlan/RollupStep.cpp
@@ -1,6 +1,7 @@
 #include <Processors/QueryPlan/RollupStep.h>
 #include <Processors/Transforms/RollupTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
 
 namespace DB
 {
@@ -22,22 +23,25 @@ static ITransformingStep::Traits getTraits()
 }
 
 RollupStep::RollupStep(const DataStream & input_stream_, AggregatingTransformParamsPtr params_)
-    : ITransformingStep(input_stream_, params_->getHeader(), getTraits())
+    : ITransformingStep(input_stream_, appendGroupingSetColumn(params_->getHeader()), getTraits())
     , params(std::move(params_))
+    , keys_size(params->params.keys_size)
 {
     /// Aggregation keys are distinct
     for (auto key : params->params.keys)
         output_stream->distinct_columns.insert(params->params.src_header.getByPosition(key).name);
 }
 
-void RollupStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+ProcessorPtr addGroupingSetForTotals(const Block & header, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number);
+
+void RollupStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
     pipeline.resize(1);
 
     pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
         if (stream_type == QueryPipelineBuilder::StreamType::Totals)
-            return nullptr;
+            return addGroupingSetForTotals(header, settings, keys_size);
 
         return std::make_shared<RollupTransform>(header, std::move(params));
     });
diff --git a/src/Processors/QueryPlan/RollupStep.h b/src/Processors/QueryPlan/RollupStep.h
index 7cd71fecdc1..3dce6f74d9f 100644
--- a/src/Processors/QueryPlan/RollupStep.h
+++ b/src/Processors/QueryPlan/RollupStep.h
@@ -20,6 +20,7 @@ public:
 
 private:
     AggregatingTransformParamsPtr params;
+    size_t keys_size;
 };
 
 }
diff --git a/src/Processors/Transforms/CubeTransform.cpp b/src/Processors/Transforms/CubeTransform.cpp
index 6b672407cd1..c699e724ffc 100644
--- a/src/Processors/Transforms/CubeTransform.cpp
+++ b/src/Processors/Transforms/CubeTransform.cpp
@@ -1,5 +1,6 @@
 #include <Processors/Transforms/CubeTransform.h>
 #include <Processors/Transforms/TotalsHavingTransform.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
 
 namespace DB
 {
@@ -9,7 +10,7 @@ namespace ErrorCodes
 }
 
 CubeTransform::CubeTransform(Block header, AggregatingTransformParamsPtr params_)
-    : IAccumulatingTransform(std::move(header), params_->getHeader())
+    : IAccumulatingTransform(std::move(header), appendGroupingSetColumn(params_->getHeader()))
     , params(std::move(params_))
     , keys(params->params.keys)
     , aggregates_mask(getAggregatesMask(params->getHeader(), params->params.aggregates))
@@ -75,6 +76,8 @@ Chunk CubeTransform::generate()
     }
 
     finalizeChunk(gen_chunk, aggregates_mask);
+    if (!gen_chunk.empty())
+        gen_chunk.addColumn(0, ColumnUInt64::create(gen_chunk.getNumRows(), grouping_set++));
     return gen_chunk;
 }
 
diff --git a/src/Processors/Transforms/CubeTransform.h b/src/Processors/Transforms/CubeTransform.h
index a1a1c9271c3..4575a01935d 100644
--- a/src/Processors/Transforms/CubeTransform.h
+++ b/src/Processors/Transforms/CubeTransform.h
@@ -30,6 +30,7 @@ private:
     Columns current_zero_columns;
 
     UInt64 mask = 0;
+    UInt64 grouping_set = 0;
 
     Chunk merge(Chunks && chunks, bool final);
 };
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 9e5d57a2b43..a41b5660e0d 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -90,9 +90,9 @@ static bool tryConvertFields(FillColumnDescription & descr, const DataTypePtr &
         if (which.isDate() || which.isDate32())
         {
             Int64 avg_seconds = get<Int64>(descr.fill_step) * descr.step_kind->toAvgSeconds();
-            if (avg_seconds < 86400)
+            if (std::abs(avg_seconds) < 86400)
                 throw Exception(ErrorCodes::INVALID_WITH_FILL_EXPRESSION,
-                                "Value of step is to low ({} seconds). Must be >= 1 day", avg_seconds);
+                                "Value of step is to low ({} seconds). Must be >= 1 day", std::abs(avg_seconds));
         }
 
         if (which.isDate())
diff --git a/src/Processors/Transforms/RollupTransform.cpp b/src/Processors/Transforms/RollupTransform.cpp
index 3150ff99e76..db60b99102d 100644
--- a/src/Processors/Transforms/RollupTransform.cpp
+++ b/src/Processors/Transforms/RollupTransform.cpp
@@ -1,11 +1,12 @@
 #include <Processors/Transforms/RollupTransform.h>
 #include <Processors/Transforms/TotalsHavingTransform.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
 
 namespace DB
 {
 
 RollupTransform::RollupTransform(Block header, AggregatingTransformParamsPtr params_)
-    : IAccumulatingTransform(std::move(header), params_->getHeader())
+    : IAccumulatingTransform(std::move(header), appendGroupingSetColumn(params_->getHeader()))
     , params(std::move(params_))
     , keys(params->params.keys)
     , aggregates_mask(getAggregatesMask(params->getHeader(), params->params.aggregates))
@@ -58,6 +59,8 @@ Chunk RollupTransform::generate()
     }
 
     finalizeChunk(gen_chunk, aggregates_mask);
+    if (!gen_chunk.empty())
+        gen_chunk.addColumn(0, ColumnUInt64::create(gen_chunk.getNumRows(), set_counter++));
     return gen_chunk;
 }
 
diff --git a/src/Processors/Transforms/RollupTransform.h b/src/Processors/Transforms/RollupTransform.h
index 74e83b8535d..8fd27e3e6a2 100644
--- a/src/Processors/Transforms/RollupTransform.h
+++ b/src/Processors/Transforms/RollupTransform.h
@@ -26,6 +26,7 @@ private:
     Chunks consumed_chunks;
     Chunk rollup_chunk;
     size_t last_removed_key = 0;
+    size_t set_counter = 0;
 
     Chunk merge(Chunks && chunks, bool final);
 };
diff --git a/src/Server/MySQLHandlerFactory.cpp b/src/Server/MySQLHandlerFactory.cpp
index 7263b234068..c02a3015945 100644
--- a/src/Server/MySQLHandlerFactory.cpp
+++ b/src/Server/MySQLHandlerFactory.cpp
@@ -16,6 +16,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_CLOSE_FILE;
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int OPENSSL_ERROR;
 }
@@ -66,7 +67,10 @@ void MySQLHandlerFactory::readRSAKeys()
         FILE * fp = fopen(certificate_file.data(), "r");
         if (fp == nullptr)
             throw Exception("Cannot open certificate file: " + certificate_file + ".", ErrorCodes::CANNOT_OPEN_FILE);
-        SCOPE_EXIT(fclose(fp));
+        SCOPE_EXIT(
+            if (0 != fclose(fp))
+                throwFromErrno("Cannot close file with the certificate in MySQLHandlerFactory", ErrorCodes::CANNOT_CLOSE_FILE);
+        );
 
         X509 * x509 = PEM_read_X509(fp, nullptr, nullptr, nullptr);
         SCOPE_EXIT(X509_free(x509));
@@ -89,7 +93,10 @@ void MySQLHandlerFactory::readRSAKeys()
         FILE * fp = fopen(private_key_file.data(), "r");
         if (fp == nullptr)
             throw Exception ("Cannot open private key file " + private_key_file + ".", ErrorCodes::CANNOT_OPEN_FILE);
-        SCOPE_EXIT(fclose(fp));
+        SCOPE_EXIT(
+            if (0 != fclose(fp))
+                throwFromErrno("Cannot close file with the certificate in MySQLHandlerFactory", ErrorCodes::CANNOT_CLOSE_FILE);
+        );
 
         private_key.reset(PEM_read_RSAPrivateKey(fp, nullptr, nullptr, nullptr));
         if (!private_key)
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index 5799100664e..fa87cfb776d 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -146,6 +146,7 @@ StorageHDFS::StorageHDFS(
     , distributed_processing(distributed_processing_)
     , partition_by(partition_by_)
 {
+    FormatFactory::instance().checkFormatName(format_name);
     context_->getRemoteHostFilter().checkURL(Poco::URI(uri_));
     checkHDFSURL(uri_);
 
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index c8ebbfcfaac..1f9e57ab2b7 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -132,8 +132,6 @@ private:
     Block block_for_format;
     std::vector<NameAndTypePair> requested_virtual_columns;
     UInt64 max_block_size;
-    bool need_path_column;
-    bool need_file_column;
     std::shared_ptr<IteratorWrapper> file_iterator;
     ColumnsDescription columns_description;
 
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 064447c54ad..0c834564ec4 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -1,7 +1,6 @@
 #include <Storages/MergeTree/DataPartsExchange.h>
 
 #include <Formats/NativeWriter.h>
-#include <Disks/IDiskRemote.h>
 #include <Disks/SingleDiskVolume.h>
 #include <Disks/createVolume.h>
 #include <IO/HTTPCommon.h>
@@ -141,6 +140,16 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
 
         CurrentMetrics::Increment metric_increment{CurrentMetrics::ReplicatedSend};
 
+        {
+            auto disk = part->volume->getDisk();
+            UInt64 revision = parse<UInt64>(params.get("disk_revision", "0"));
+            if (revision)
+                disk->syncRevision(revision);
+            revision = disk->getRevision();
+            if (revision)
+                response.addCookie({"disk_revision", toString(revision)});
+        }
+
         if (client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE)
             writeBinary(part->checksums.getTotalSizeOnDisk(), out);
 
@@ -419,6 +428,13 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
         {"compress",                "false"}
     });
 
+    if (disk)
+    {
+        UInt64 revision = disk->getRevision();
+        if (revision)
+            uri.addQueryParameter("disk_revision", toString(revision));
+    }
+
     Strings capability;
     if (try_zero_copy && data_settings->allow_remote_fs_zero_copy_replication)
     {
@@ -453,29 +469,28 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
         creds.setPassword(password);
     }
 
-    PooledReadWriteBufferFromHTTP in{
+    std::unique_ptr<PooledReadWriteBufferFromHTTP> in = std::make_unique<PooledReadWriteBufferFromHTTP>(
         uri,
         Poco::Net::HTTPRequest::HTTP_POST,
-        {},
+        nullptr,
         timeouts,
         creds,
         DBMS_DEFAULT_BUFFER_SIZE,
         0, /* no redirects */
-        data_settings->replicated_max_parallel_fetches_for_host
-    };
+        static_cast<uint64_t>(data_settings->replicated_max_parallel_fetches_for_host));
 
-    int server_protocol_version = parse<int>(in.getResponseCookie("server_protocol_version", "0"));
+    int server_protocol_version = parse<int>(in->getResponseCookie("server_protocol_version", "0"));
 
     ReservationPtr reservation;
     size_t sum_files_size = 0;
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE)
     {
-        readBinary(sum_files_size, in);
+        readBinary(sum_files_size, *in);
         if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE_AND_TTL_INFOS)
         {
             IMergeTreeDataPart::TTLInfos ttl_infos;
             String ttl_infos_string;
-            readBinary(ttl_infos_string, in);
+            readBinary(ttl_infos_string, *in);
             ReadBufferFromString ttl_infos_buffer(ttl_infos_string);
             assertString("ttl format version: 1\n", ttl_infos_buffer);
             ttl_infos.read(ttl_infos_buffer);
@@ -503,18 +518,22 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     if (!disk)
         disk = reservation->getDisk();
 
+    UInt64 revision = parse<UInt64>(in->getResponseCookie("disk_revision", "0"));
+    if (revision)
+        disk->syncRevision(revision);
+
     bool sync = (data_settings->min_compressed_bytes_to_fsync_after_fetch
                     && sum_files_size >= data_settings->min_compressed_bytes_to_fsync_after_fetch);
 
     String part_type = "Wide";
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE)
-        readStringBinary(part_type, in);
+        readStringBinary(part_type, *in);
 
     UUID part_uuid = UUIDHelpers::Nil;
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
-        readUUIDText(part_uuid, in);
+        readUUIDText(part_uuid, *in);
 
-    String remote_fs_metadata = parse<String>(in.getResponseCookie("remote_fs_metadata", ""));
+    String remote_fs_metadata = parse<String>(in->getResponseCookie("remote_fs_metadata", ""));
     if (!remote_fs_metadata.empty())
     {
         if (!try_zero_copy)
@@ -528,7 +547,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
         try
         {
-            return downloadPartToDiskRemoteMeta(part_name, replica_path, to_detached, tmp_prefix_, disk, in, throttler);
+            return downloadPartToDiskRemoteMeta(part_name, replica_path, to_detached, tmp_prefix_, disk, *in, throttler);
         }
         catch (const Exception & e)
         {
@@ -536,6 +555,18 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
                 throw;
 
             LOG_WARNING(log, fmt::runtime(e.message() + " Will retry fetching part without zero-copy."));
+
+            /// It's important to release session from HTTP pool. Otherwise it's possible to get deadlock
+            /// on http pool.
+            try
+            {
+                in.reset();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log);
+            }
+
             /// Try again but without zero-copy
             return fetchPart(metadata_snapshot, context, part_name, replica_path, host, port, timeouts,
                 user, password, interserver_scheme, throttler, to_detached, tmp_prefix_, nullptr, false, disk);
@@ -549,16 +580,16 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
         part_info.partition_id, part_name, new_part_path,
         replica_path, uri, to_detached, sum_files_size);
 
-    in.setNextCallback(ReplicatedFetchReadCallback(*entry));
+    in->setNextCallback(ReplicatedFetchReadCallback(*entry));
 
     size_t projections = 0;
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION)
-        readBinary(projections, in);
+        readBinary(projections, *in);
 
     MergeTreeData::DataPart::Checksums checksums;
     return part_type == "InMemory"
-        ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, context, disk, in, projections, throttler)
-        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, disk, in, projections, checksums, throttler);
+        ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, context, disk, *in, projections, throttler)
+        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, disk, *in, projections, checksums, throttler);
 }
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
index 4b8860aa51d..08a5c653a7f 100644
--- a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -184,7 +184,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
 
     if (storage_settings_ptr->allow_remote_fs_zero_copy_replication)
     {
-        if (auto disk = reserved_space->getDisk(); disk->getType() == DB::DiskType::S3)
+        if (auto disk = reserved_space->getDisk(); disk->supportZeroCopyReplication())
         {
             String dummy;
             if (!storage.findReplicaHavingCoveringPart(entry.new_part_name, true, dummy).empty())
@@ -322,6 +322,7 @@ bool MergeFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWrite
     ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
 
     write_part_log({});
+    storage.incrementMergedPartsProfileEvent(part->getType());
 
     return true;
 }
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
index 0146ce4c7b3..c6a719fbc67 100644
--- a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
@@ -117,6 +117,7 @@ void MergePlainMergeTreeTask::finish()
     new_part = merge_task->getFuture().get();
     storage.merger_mutator.renameMergedTemporaryPart(new_part, future_part->parts, txn, nullptr);
     write_part_log({});
+    storage.incrementMergedPartsProfileEvent(new_part->getType());
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
index 3f82e60e82f..3399d46f0bb 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -62,6 +62,12 @@ void MergeTreeBackgroundExecutor<Queue>::increaseThreadsAndMaxTasksCount(size_t
     threads_count = new_threads_count;
 }
 
+template <class Queue>
+size_t MergeTreeBackgroundExecutor<Queue>::getMaxTasksCount() const
+{
+    std::lock_guard lock(mutex);
+    return max_tasks_count;
+}
 
 template <class Queue>
 bool MergeTreeBackgroundExecutor<Queue>::trySchedule(ExecutableTaskPtr task)
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
index bf3e7dc8bd8..de5af5199c0 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -192,6 +192,7 @@ public:
     /// Supports only increasing the number of threads and tasks, because
     /// implementing tasks eviction will definitely be too error-prone and buggy.
     void increaseThreadsAndMaxTasksCount(size_t new_threads_count, size_t new_max_tasks_count);
+    size_t getMaxTasksCount() const;
 
     bool trySchedule(ExecutableTaskPtr task);
     void removeTasksCorrespondingToStorage(StorageID id);
@@ -209,7 +210,7 @@ private:
     /// Initially it will be empty
     Queue pending{};
     boost::circular_buffer<TaskRuntimeDataPtr> active{0};
-    std::mutex mutex;
+    mutable std::mutex mutex;
     std::condition_variable has_tasks;
     std::atomic_bool shutdown{false};
     ThreadPool pool;
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index d2c757f6750..4eb4049be60 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -93,6 +93,12 @@ namespace ProfileEvents
     extern const Event DelayedInserts;
     extern const Event DelayedInsertsMilliseconds;
     extern const Event DuplicatedInsertedBlocks;
+    extern const Event InsertedWideParts;
+    extern const Event InsertedCompactParts;
+    extern const Event InsertedInMemoryParts;
+    extern const Event MergedIntoWideParts;
+    extern const Event MergedIntoCompactParts;
+    extern const Event MergedIntoInMemoryParts;
 }
 
 namespace CurrentMetrics
@@ -226,7 +232,7 @@ MergeTreeData::MergeTreeData(
 
     /// Check sanity of MergeTreeSettings. Only when table is created.
     if (!attach)
-        settings->sanityCheck(getContext()->getSettingsRef());
+        settings->sanityCheck(getContext()->getMergeMutateExecutor()->getMaxTasksCount());
 
     MergeTreeDataFormatVersion min_format_version(0);
     if (!date_column_name.empty())
@@ -394,7 +400,7 @@ static void checkKeyExpression(const ExpressionActions & expr, const Block & sam
 
         if (!allow_nullable_key && hasNullable(element.type))
             throw Exception(
-                ErrorCodes::ILLEGAL_COLUMN, "{} key contains nullable columns, but `setting allow_nullable_key` is disabled", key_name);
+                ErrorCodes::ILLEGAL_COLUMN, "{} key contains nullable columns, but merge tree setting `allow_nullable_key` is disabled", key_name);
     }
 }
 
@@ -1716,6 +1722,7 @@ void MergeTreeData::removePartsFinally(const MergeTreeData::DataPartsVector & pa
             part_log_elem.part_name = part->name;
             part_log_elem.bytes_compressed_on_disk = part->getBytesOnDisk();
             part_log_elem.rows = part->rows_count;
+            part_log_elem.part_type = part->getType();
 
             part_log->add(part_log_elem);
         }
@@ -2569,7 +2576,7 @@ void MergeTreeData::changeSettings(
         /// Reset to default settings before applying existing.
         auto copy = getDefaultSettings();
         copy->applyChanges(new_changes);
-        copy->sanityCheck(getContext()->getSettingsRef());
+        copy->sanityCheck(getContext()->getMergeMutateExecutor()->getMaxTasksCount());
 
         storage_settings.set(std::move(copy));
         StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -3072,7 +3079,9 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
         throw Exception("No such data part " + part_to_detach->getNameWithState(), ErrorCodes::NO_SUCH_DATA_PART);
 
     /// What if part_to_detach is a reference to *it_part? Make a new owner just in case.
-    DataPartPtr part = *it_part;
+    /// Important to own part pointer here (not const reference), because it will be removed from data_parts_indexes
+    /// few lines below.
+    DataPartPtr part = *it_part; // NOLINT
 
     if (part->getState() == DataPartState::Active)
     {
@@ -6190,6 +6199,7 @@ try
         part_log_elem.path_on_disk = result_part->getFullPath();
         part_log_elem.bytes_compressed_on_disk = result_part->getBytesOnDisk();
         part_log_elem.rows = result_part->rows_count;
+        part_log_elem.part_type = result_part->getType();
     }
 
     part_log_elem.source_part_names.reserve(source_parts.size());
@@ -6755,6 +6765,42 @@ StorageSnapshotPtr MergeTreeData::getStorageSnapshot(const StorageMetadataPtr &
     return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, object_columns, std::move(snapshot_data));
 }
 
+void MergeTreeData::incrementInsertedPartsProfileEvent(MergeTreeDataPartType type)
+{
+    switch (type.getValue())
+    {
+        case MergeTreeDataPartType::Wide:
+            ProfileEvents::increment(ProfileEvents::InsertedWideParts);
+            break;
+        case MergeTreeDataPartType::Compact:
+            ProfileEvents::increment(ProfileEvents::InsertedCompactParts);
+            break;
+        case MergeTreeDataPartType::InMemory:
+            ProfileEvents::increment(ProfileEvents::InsertedInMemoryParts);
+            break;
+        default:
+            break;
+    }
+}
+
+void MergeTreeData::incrementMergedPartsProfileEvent(MergeTreeDataPartType type)
+{
+    switch (type.getValue())
+    {
+        case MergeTreeDataPartType::Wide:
+            ProfileEvents::increment(ProfileEvents::MergedIntoWideParts);
+            break;
+        case MergeTreeDataPartType::Compact:
+            ProfileEvents::increment(ProfileEvents::MergedIntoCompactParts);
+            break;
+        case MergeTreeDataPartType::InMemory:
+            ProfileEvents::increment(ProfileEvents::MergedIntoInMemoryParts);
+            break;
+        default:
+            break;
+    }
+}
+
 CurrentlySubmergingEmergingTagger::~CurrentlySubmergingEmergingTagger()
 {
     std::lock_guard lock(storage.currently_submerging_emerging_mutex);
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index df37cd000e4..1ba09251f6f 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -1224,6 +1224,8 @@ protected:
     /// Moves part to specified space, used in ALTER ... MOVE ... queries
     bool movePartsToSpace(const DataPartsVector & parts, SpacePtr space);
 
+    static void incrementInsertedPartsProfileEvent(MergeTreeDataPartType type);
+    static void incrementMergedPartsProfileEvent(MergeTreeDataPartType type);
 
 private:
     /// RAII Wrapper for atomic work with currently moving parts
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 99e5ef3ee21..f596828ed05 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -83,8 +83,11 @@ UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge() const
 UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge(size_t max_count, size_t scheduled_tasks_count) const
 {
     if (scheduled_tasks_count > max_count)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: invalid argument passed to \
-            getMaxSourcePartsSize: scheduled_tasks_count = {} > max_count = {}", scheduled_tasks_count, max_count);
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Logical error: invalid argument passed to getMaxSourcePartsSize: scheduled_tasks_count = {} > max_count = {}",
+            scheduled_tasks_count, max_count);
+    }
 
     size_t free_entries = max_count - scheduled_tasks_count;
     const auto data_settings = data.getSettings();
@@ -532,46 +535,6 @@ MutateTaskPtr MergeTreeDataMergerMutator::mutatePartToTemporaryPart(
 }
 
 
-MergeAlgorithm MergeTreeDataMergerMutator::chooseMergeAlgorithm(
-    const MergeTreeData::DataPartsVector & parts,
-    size_t sum_rows_upper_bound,
-    const NamesAndTypesList & gathering_columns,
-    bool deduplicate,
-    bool need_remove_expired_values,
-    const MergeTreeData::MergingParams & merging_params) const
-{
-    const auto data_settings = data.getSettings();
-
-    if (deduplicate)
-        return MergeAlgorithm::Horizontal;
-    if (data_settings->enable_vertical_merge_algorithm == 0)
-        return MergeAlgorithm::Horizontal;
-    if (need_remove_expired_values)
-        return MergeAlgorithm::Horizontal;
-
-    for (const auto & part : parts)
-        if (!part->supportsVerticalMerge())
-            return MergeAlgorithm::Horizontal;
-
-    bool is_supported_storage =
-        merging_params.mode == MergeTreeData::MergingParams::Ordinary ||
-        merging_params.mode == MergeTreeData::MergingParams::Collapsing ||
-        merging_params.mode == MergeTreeData::MergingParams::Replacing ||
-        merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing;
-
-    bool enough_ordinary_cols = gathering_columns.size() >= data_settings->vertical_merge_algorithm_min_columns_to_activate;
-
-    bool enough_total_rows = sum_rows_upper_bound >= data_settings->vertical_merge_algorithm_min_rows_to_activate;
-
-    bool no_parts_overflow = parts.size() <= RowSourcePart::MAX_PARTS;
-
-    auto merge_alg = (is_supported_storage && enough_total_rows && enough_ordinary_cols && no_parts_overflow) ?
-                        MergeAlgorithm::Vertical : MergeAlgorithm::Horizontal;
-
-    return merge_alg;
-}
-
-
 MergeTreeData::DataPartPtr MergeTreeDataMergerMutator::renameMergedTemporaryPart(
     MergeTreeData::MutableDataPartPtr & new_data_part,
     const MergeTreeData::DataPartsVector & parts,
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index f99f3d2e70d..a5f99c63f11 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -154,15 +154,6 @@ public :
     ActionBlocker ttl_merges_blocker;
 
 private:
-
-    MergeAlgorithm chooseMergeAlgorithm(
-        const MergeTreeData::DataPartsVector & parts,
-        size_t rows_upper_bound,
-        const NamesAndTypesList & gathering_columns,
-        bool deduplicate,
-        bool need_remove_expired_values,
-        const MergeTreeData::MergingParams & merging_params) const;
-
     MergeTreeData & data;
     const size_t max_tasks_count;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index a8e4854f809..1866d65ccfd 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -840,7 +840,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
 
         Strings forced_indices;
         {
-            Tokens tokens(&indices[0], &indices[indices.size()], settings.max_query_size);
+            Tokens tokens(indices.data(), &indices[indices.size()], settings.max_query_size);
             IParser::Pos pos(tokens, settings.max_parser_depth);
             Expected expected;
             if (!parseIdentifiersOrStringLiterals(pos, expected, forced_indices))
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index bf247074f57..7e08fb0ccfc 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -451,6 +451,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPart(
                 temp_part.streams.emplace_back(std::move(stream));
         }
     }
+
     auto finalizer = out->finalizePartAsync(
         new_data_part,
         data_settings->fsync_after_insert,
@@ -460,8 +461,6 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPart(
     temp_part.part = new_data_part;
     temp_part.streams.emplace_back(TemporaryPart::Stream{.stream = std::move(out), .finalizer = std::move(finalizer)});
 
-    /// out.finish(new_data_part, std::move(written_files), sync_on_insert);
-
     ProfileEvents::increment(ProfileEvents::MergeTreeDataWriterRows, block.rows());
     ProfileEvents::increment(ProfileEvents::MergeTreeDataWriterUncompressedBytes, block.bytes());
     ProfileEvents::increment(ProfileEvents::MergeTreeDataWriterCompressedBytes, new_data_part->getBytesOnDisk());
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
index 33960e2e1ff..07f6e3f3be7 100644
--- a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
@@ -3,9 +3,10 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <IO/ReadBufferFromFile.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <Disks/WriteMode.h>
+#include <Disks/IDisk.h>
 
 namespace DB
 {
@@ -74,27 +75,27 @@ size_t getLogNumber(const std::string & path_str)
 MergeTreeDeduplicationLog::MergeTreeDeduplicationLog(
     const std::string & logs_dir_,
     size_t deduplication_window_,
-    const MergeTreeDataFormatVersion & format_version_)
+    const MergeTreeDataFormatVersion & format_version_,
+    DiskPtr disk_)
     : logs_dir(logs_dir_)
     , deduplication_window(deduplication_window_)
     , rotate_interval(deduplication_window_ * 2) /// actually it doesn't matter
     , format_version(format_version_)
     , deduplication_map(deduplication_window)
+    , disk(disk_)
 {
-    namespace fs = std::filesystem;
-    if (deduplication_window != 0 && !fs::exists(logs_dir))
-        fs::create_directories(logs_dir);
+    if (deduplication_window != 0 && !disk->exists(logs_dir))
+        disk->createDirectories(logs_dir);
 }
 
 void MergeTreeDeduplicationLog::load()
 {
-    namespace fs = std::filesystem;
-    if (!fs::exists(logs_dir))
+    if (!disk->exists(logs_dir))
         return;
 
-    for (const auto & p : fs::directory_iterator(logs_dir))
+    for (auto it = disk->iterateDirectory(logs_dir); it->isValid(); it->next())
     {
-        const auto & path = p.path();
+        const auto & path = it->path();
         auto log_number = getLogNumber(path);
         existing_logs[log_number] = {path, 0};
     }
@@ -124,19 +125,19 @@ void MergeTreeDeduplicationLog::load()
 
         /// Can happen in case we have unfinished log
         if (!current_writer)
-            current_writer = std::make_unique<WriteBufferFromFile>(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+            current_writer = disk->writeFile(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
     }
 }
 
 size_t MergeTreeDeduplicationLog::loadSingleLog(const std::string & path)
 {
-    ReadBufferFromFile read_buf(path);
+    auto read_buf = disk->readFile(path);
 
     size_t total_entries = 0;
-    while (!read_buf.eof())
+    while (!read_buf->eof())
     {
         MergeTreeDeduplicationLogRecord record;
-        readRecord(record, read_buf);
+        readRecord(record, *read_buf);
         if (record.operation == MergeTreeDeduplicationOp::DROP)
             deduplication_map.erase(record.block_id);
         else
@@ -160,7 +161,7 @@ void MergeTreeDeduplicationLog::rotate()
     if (current_writer)
         current_writer->sync();
 
-    current_writer = std::make_unique<WriteBufferFromFile>(log_description.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    current_writer = disk->writeFile(log_description.path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
 }
 
 void MergeTreeDeduplicationLog::dropOutdatedLogs()
@@ -188,7 +189,7 @@ void MergeTreeDeduplicationLog::dropOutdatedLogs()
         for (auto itr = existing_logs.begin(); itr != existing_logs.end();)
         {
             size_t number = itr->first;
-            std::filesystem::remove(itr->second.path);
+            disk->removeFile(itr->second.path);
             itr = existing_logs.erase(itr);
             if (remove_from_value == number)
                 break;
@@ -297,15 +298,42 @@ void MergeTreeDeduplicationLog::setDeduplicationWindowSize(size_t deduplication_
     rotate_interval = deduplication_window * 2;
 
     /// If settings was set for the first time with ALTER MODIFY SETTING query
-    if (deduplication_window != 0 && !std::filesystem::exists(logs_dir))
-        std::filesystem::create_directories(logs_dir);
+    if (deduplication_window != 0 && !disk->exists(logs_dir))
+        disk->createDirectories(logs_dir);
 
     deduplication_map.setMaxSize(deduplication_window);
     rotateAndDropIfNeeded();
 
     /// Can happen in case we have unfinished log
     if (!current_writer)
-        current_writer = std::make_unique<WriteBufferFromFile>(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+        current_writer = disk->writeFile(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
+}
+
+
+void MergeTreeDeduplicationLog::shutdown()
+{
+    std::lock_guard lock(state_mutex);
+    if (stopped)
+        return;
+
+    stopped = true;
+    if (current_writer)
+    {
+        current_writer->finalize();
+        current_writer.reset();
+    }
+}
+
+MergeTreeDeduplicationLog::~MergeTreeDeduplicationLog()
+{
+    try
+    {
+        shutdown();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
index eda217798b2..2c90c9f43b1 100644
--- a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <Core/Types.h>
 #include <base/StringRef.h>
-#include <IO/WriteBufferFromFile.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
+#include <Disks/IDisk.h>
 #include <map>
 #include <list>
 #include <mutex>
@@ -137,7 +137,8 @@ public:
     MergeTreeDeduplicationLog(
         const std::string & logs_dir_,
         size_t deduplication_window_,
-        const MergeTreeDataFormatVersion & format_version_);
+        const MergeTreeDataFormatVersion & format_version_,
+        DiskPtr disk_);
 
     /// Add part into in-memory hash table and to disk
     /// Return true and part info if insertion was successful.
@@ -151,6 +152,10 @@ public:
     void load();
 
     void setDeduplicationWindowSize(size_t deduplication_window_);
+
+    void shutdown();
+
+    ~MergeTreeDeduplicationLog();
 private:
     const std::string logs_dir;
     /// Size of deduplication window
@@ -171,11 +176,16 @@ private:
     LimitedOrderedHashMap<MergeTreePartInfo> deduplication_map;
 
     /// Writer to the current log file
-    std::unique_ptr<WriteBufferFromFile> current_writer;
+    std::unique_ptr<WriteBufferFromFileBase> current_writer;
 
     /// Overall mutex because we can have a lot of cocurrent inserts
     std::mutex state_mutex;
 
+    /// Disk where log is stored
+    DiskPtr disk;
+
+    bool stopped{false};
+
     /// Start new log
     void rotate();
 
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index c1cc3b6ed3c..5b78a59687b 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -73,10 +73,9 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def)
 #undef ADD_IF_ABSENT
 }
 
-void MergeTreeSettings::sanityCheck(const Settings & query_settings) const
+void MergeTreeSettings::sanityCheck(size_t background_pool_tasks) const
 {
-    if (number_of_free_entries_in_pool_to_execute_mutation >
-        query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio)
+    if (number_of_free_entries_in_pool_to_execute_mutation > background_pool_tasks)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "The value of 'number_of_free_entries_in_pool_to_execute_mutation' setting"
             " ({}) (default values are defined in <merge_tree> section of config.xml"
@@ -85,11 +84,10 @@ void MergeTreeSettings::sanityCheck(const Settings & query_settings) const
             " ({}) (the value is defined in users.xml for default profile)."
             " This indicates incorrect configuration because mutations cannot work with these settings.",
             number_of_free_entries_in_pool_to_execute_mutation,
-            query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio);
+            background_pool_tasks);
     }
 
-    if (number_of_free_entries_in_pool_to_lower_max_size_of_merge >
-        query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio)
+    if (number_of_free_entries_in_pool_to_lower_max_size_of_merge > background_pool_tasks)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "The value of 'number_of_free_entries_in_pool_to_lower_max_size_of_merge' setting"
             " ({}) (default values are defined in <merge_tree> section of config.xml"
@@ -98,7 +96,7 @@ void MergeTreeSettings::sanityCheck(const Settings & query_settings) const
             " ({}) (the value is defined in users.xml for default profile)."
             " This indicates incorrect configuration because the maximum size of merge will be always lowered.",
             number_of_free_entries_in_pool_to_lower_max_size_of_merge,
-            query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio);
+            background_pool_tasks);
     }
 
     // The min_index_granularity_bytes value is 1024 b and index_granularity_bytes is 10 mb by default.
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index 0d984dc4dee..0b5d09803d7 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -183,7 +183,7 @@ struct MergeTreeSettings : public BaseSettings<MergeTreeSettingsTraits>
     }
 
     /// Check that the values are sane taking also query-level settings into account.
-    void sanityCheck(const Settings & query_settings) const;
+    void sanityCheck(size_t background_pool_tasks) const;
 };
 
 using MergeTreeSettingsPtr = std::shared_ptr<const MergeTreeSettings>;
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 93b9f356595..4dc4d62c2a2 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -137,6 +137,7 @@ void MergeTreeSink::finishDelayedChunk()
         if (storage.renameTempPartAndAdd(part, context->getCurrentTransaction().get(), &storage.increment, nullptr, storage.getDeduplicationLog(), partition.block_dedup_token))
         {
             PartLog::addNewPart(storage.getContext(), part, partition.elapsed_ns);
+            storage.incrementInsertedPartsProfileEvent(part->getType());
 
             /// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
             storage.background_operations_assignee.trigger();
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
index ff08ba0c062..f46bce1c87b 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -110,7 +110,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
 
     if (storage_settings_ptr->allow_remote_fs_zero_copy_replication)
     {
-        if (auto disk = reserved_space->getDisk(); disk->getType() == DB::DiskType::S3)
+        if (auto disk = reserved_space->getDisk(); disk->supportZeroCopyReplication())
         {
             String dummy;
             if (!storage.findReplicaHavingCoveringPart(entry.new_part_name, true, dummy).empty())
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index a19e3a778cd..e7882ce4952 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -319,12 +319,12 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
         size_t columns_size;
         in >> columns_size >> "\n";
         columns_str.resize(columns_size);
-        in.readStrict(&columns_str[0], columns_size);
+        in.readStrict(columns_str.data(), columns_size);
         in >> "\nmetadata_str_size:\n";
         size_t metadata_size;
         in >> metadata_size >> "\n";
         metadata_str.resize(metadata_size);
-        in.readStrict(&metadata_str[0], metadata_size);
+        in.readStrict(metadata_str.data(), metadata_size);
     }
     else if (type_str == "sync_pinned_part_uuids")
     {
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 0e7c83742a4..fbdb1dabd88 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1219,7 +1219,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
             auto disks = storage.getDisks();
             bool only_s3_storage = true;
             for (const auto & disk : disks)
-                if (disk->getType() != DB::DiskType::S3)
+                if (!disk->supportZeroCopyReplication())
                     only_s3_storage = false;
 
             if (!disks.empty() && only_s3_storage && storage.checkZeroCopyLockExists(entry.new_part_name, disks[0]))
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 126d34bcc1d..de893d59b05 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -261,6 +261,7 @@ void ReplicatedMergeTreeSink::finishDelayedChunk(zkutil::ZooKeeperPtr & zookeepe
             /// Set a special error code if the block is duplicate
             int error = (deduplicate && part->is_duplicate) ? ErrorCodes::INSERT_WAS_DEDUPLICATED : 0;
             PartLog::addNewPart(storage.getContext(), part, partition.elapsed_ns, ExecutionStatus(error));
+            storage.incrementInsertedPartsProfileEvent(part->getType());
         }
         catch (...)
         {
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index 5e9966a2794..ad35c5d420b 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -109,7 +109,7 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
     InterpreterSelectQuery select(
         result.query_ast, query_context, storage, {},
         /// Here we ignore ast optimizations because otherwise aggregation keys may be removed from result header as constants.
-        SelectQueryOptions{QueryProcessingStage::WithMergeableState}.modify().ignoreAlias().ignoreASTOptimizationsAlias());
+        SelectQueryOptions{QueryProcessingStage::WithMergeableState}.modify().ignoreAlias().ignoreASTOptimizations());
 
     result.required_columns = select.getRequiredColumns();
     result.sample_block = select.getSampleBlock();
@@ -221,7 +221,7 @@ ProjectionDescription ProjectionDescription::getMinMaxCountProjection(
     InterpreterSelectQuery select(
         result.query_ast, query_context, storage, {},
         /// Here we ignore ast optimizations because otherwise aggregation keys may be removed from result header as constants.
-        SelectQueryOptions{QueryProcessingStage::WithMergeableState}.modify().ignoreAlias().ignoreASTOptimizationsAlias());
+        SelectQueryOptions{QueryProcessingStage::WithMergeableState}.modify().ignoreAlias().ignoreASTOptimizations());
     result.required_columns = select.getRequiredColumns();
     result.sample_block = select.getSampleBlock();
 
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 9dadab56eb5..194c1f4fd2d 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -382,6 +382,8 @@ StorageFile::StorageFile(CommonArguments args)
     , compression_method(args.compression_method)
     , base_path(args.getContext()->getPath())
 {
+    if (format_name != "Distributed")
+        FormatFactory::instance().checkFormatName(format_name);
 }
 
 void StorageFile::setStorageMetadata(CommonArguments args)
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index b685162f826..2cb62801fd5 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -100,9 +100,7 @@ StorageMergeTree::StorageMergeTree(
         attach)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this,
-        getContext()->getSettingsRef().background_merges_mutations_concurrency_ratio *
-        getContext()->getSettingsRef().background_pool_size)
+    , merger_mutator(*this, getContext()->getMergeMutateExecutor()->getMaxTasksCount())
 {
     loadDataParts(has_force_restore_data_flag);
 
@@ -184,6 +182,9 @@ void StorageMergeTree::shutdown()
     background_operations_assignee.finish();
     background_moves_assignee.finish();
 
+    if (deduplication_log)
+        deduplication_log->shutdown();
+
     try
     {
         /// We clear all old parts after stopping all background operations.
@@ -191,7 +192,11 @@ void StorageMergeTree::shutdown()
         /// parts which will remove themselves in their destructors. If so, we
         /// may have race condition between our remove call and background
         /// process.
-        clearOldPartsFromFilesystem(true);
+        /// Do not clear old parts in case when server is shutting down because it failed to start due to some exception.
+
+        if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER
+            && Context::getGlobalContextInstance()->isServerCompletelyStarted())
+            clearOldPartsFromFilesystem(true);
     }
     catch (...)
     {
@@ -713,8 +718,9 @@ void StorageMergeTree::loadDeduplicationLog()
     if (settings->non_replicated_deduplication_window != 0 && format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
         throw Exception("Deduplication for non-replicated MergeTree in old syntax is not supported", ErrorCodes::BAD_ARGUMENTS);
 
-    std::string path = getDataPaths()[0] + "/deduplication_logs";
-    deduplication_log = std::make_unique<MergeTreeDeduplicationLog>(path, settings->non_replicated_deduplication_window, format_version);
+    auto disk = getDisks()[0];
+    std::string path = fs::path(relative_data_path) / "deduplication_logs";
+    deduplication_log = std::make_unique<MergeTreeDeduplicationLog>(path, settings->non_replicated_deduplication_window, format_version, disk);
     deduplication_log->load();
 }
 
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index feadca23921..1d4b22d4a59 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -263,9 +263,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , replica_path(fs::path(zookeeper_path) / "replicas" / replica_name_)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this,
-        getContext()->getSettingsRef().background_merges_mutations_concurrency_ratio *
-        getContext()->getSettingsRef().background_pool_size)
+    , merger_mutator(*this, getContext()->getMergeMutateExecutor()->getMaxTasksCount())
     , merge_strategy_picker(*this)
     , queue(*this, merge_strategy_picker)
     , fetcher(*this)
@@ -7760,7 +7758,8 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
 }
 
 
-Strings StorageReplicatedMergeTree::getZeroCopyPartPath(const MergeTreeSettings & settings, DiskType disk_type, const String & table_uuid,
+Strings StorageReplicatedMergeTree::getZeroCopyPartPath(
+    const MergeTreeSettings & settings, DiskType disk_type, const String & table_uuid,
     const String & part_name, const String & zookeeper_path_old)
 {
     Strings res;
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 914aef0e54b..393ea0e24ff 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -25,6 +25,7 @@
 #include <Storages/StorageS3Settings.h>
 #include <Storages/StorageSnapshot.h>
 #include <Storages/PartitionedSink.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Storages/getVirtualsForStorage.h>
 
 #include <IO/ReadBufferFromS3.h>
@@ -75,17 +76,27 @@ namespace ErrorCodes
     extern const int UNEXPECTED_EXPRESSION;
     extern const int DATABASE_ACCESS_DENIED;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
+    extern const int NOT_IMPLEMENTED;
 }
 
 class IOutputFormat;
 using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
 
-class StorageS3Source::DisclosedGlobIterator::Impl
+class StorageS3Source::DisclosedGlobIterator::Impl : WithContext
 {
 
 public:
-    Impl(Aws::S3::S3Client & client_, const S3::URI & globbed_uri_)
-        : client(client_), globbed_uri(globbed_uri_)
+    Impl(
+        const Aws::S3::S3Client & client_,
+        const S3::URI & globbed_uri_,
+        ASTPtr & query_,
+        const Block & virtual_header_,
+        ContextPtr context_)
+        : WithContext(context_)
+        , client(client_)
+        , globbed_uri(globbed_uri_)
+        , query(query_)
+        , virtual_header(virtual_header_)
     {
         if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
             throw Exception("Expression can not have wildcards inside bucket name", ErrorCodes::UNEXPECTED_EXPRESSION);
@@ -101,6 +112,20 @@ public:
             return;
         }
 
+        /// Create a virtual block with one row to construct filter
+        if (query && virtual_header)
+        {
+            /// Append "key" column as the filter result
+            virtual_header.insert({ColumnString::create(), std::make_shared<DataTypeString>(), "_key"});
+
+            auto block = virtual_header.cloneEmpty();
+            MutableColumns columns = block.mutateColumns();
+            for (auto & column : columns)
+                column->insertDefault();
+            block.setColumns(std::move(columns));
+            VirtualColumnUtils::prepareFilterBlockWithQuery(query, getContext(), block, filter_ast);
+        }
+
         request.SetBucket(globbed_uri.bucket);
         request.SetPrefix(key_prefix);
         matcher = std::make_unique<re2::RE2>(makeRegexpPatternFromGlobs(globbed_uri.key));
@@ -144,13 +169,52 @@ private:
 
         const auto & result_batch = outcome.GetResult().GetContents();
 
-        buffer.reserve(result_batch.size());
-        for (const auto & row : result_batch)
+        if (filter_ast)
         {
-            String key = row.GetKey();
-            if (re2::RE2::FullMatch(key, *matcher))
-                buffer.emplace_back(std::move(key));
+            auto block = virtual_header.cloneEmpty();
+            MutableColumnPtr path_column;
+            MutableColumnPtr file_column;
+            MutableColumnPtr key_column = block.getByName("_key").column->assumeMutable();
+
+            if (block.has("_path"))
+                path_column = block.getByName("_path").column->assumeMutable();
+
+            if (block.has("_file"))
+                file_column = block.getByName("_file").column->assumeMutable();
+
+            for (const auto & row : result_batch)
+            {
+                const String & key = row.GetKey();
+                if (re2::RE2::FullMatch(key, *matcher))
+                {
+                    String path = fs::path(globbed_uri.bucket) / key;
+                    String file = path.substr(path.find_last_of('/') + 1);
+                    if (path_column)
+                        path_column->insert(path);
+                    if (file_column)
+                        file_column->insert(file);
+                    key_column->insert(key);
+                }
+            }
+
+            VirtualColumnUtils::filterBlockWithQuery(query, block, getContext(), filter_ast);
+            const ColumnString & keys = typeid_cast<const ColumnString &>(*block.getByName("_key").column);
+            size_t rows = block.rows();
+            buffer.reserve(rows);
+            for (size_t i = 0; i < rows; ++i)
+                buffer.emplace_back(keys.getDataAt(i).toString());
         }
+        else
+        {
+            buffer.reserve(result_batch.size());
+            for (const auto & row : result_batch)
+            {
+                String key = row.GetKey();
+                if (re2::RE2::FullMatch(key, *matcher))
+                    buffer.emplace_back(std::move(key));
+            }
+        }
+
         /// Set iterator only after the whole batch is processed
         buffer_iter = buffer.begin();
 
@@ -165,25 +229,87 @@ private:
     Strings::iterator buffer_iter;
     Aws::S3::S3Client client;
     S3::URI globbed_uri;
+    ASTPtr query;
+    Block virtual_header;
+    ASTPtr filter_ast;
     Aws::S3::Model::ListObjectsV2Request request;
     Aws::S3::Model::ListObjectsV2Outcome outcome;
     std::unique_ptr<re2::RE2> matcher;
     bool is_finished{false};
 };
 
-StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(Aws::S3::S3Client & client_, const S3::URI & globbed_uri_)
-    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_)) {}
+StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
+    const Aws::S3::S3Client & client_,
+    const S3::URI & globbed_uri_,
+    ASTPtr query,
+    const Block & virtual_header,
+    ContextPtr context)
+    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_, query, virtual_header, context))
+{
+}
 
 String StorageS3Source::DisclosedGlobIterator::next()
 {
     return pimpl->next();
 }
 
-class StorageS3Source::KeysIterator::Impl
+class StorageS3Source::KeysIterator::Impl : WithContext
 {
 public:
-    explicit Impl(const std::vector<String> & keys_) : keys(keys_)
+    explicit Impl(
+        const std::vector<String> & keys_, const String & bucket_, ASTPtr query_, const Block & virtual_header_, ContextPtr context_)
+        : WithContext(context_), keys(keys_), bucket(bucket_), query(query_), virtual_header(virtual_header_)
     {
+        /// Create a virtual block with one row to construct filter
+        if (query && virtual_header)
+        {
+            /// Append "key" column as the filter result
+            virtual_header.insert({ColumnString::create(), std::make_shared<DataTypeString>(), "_key"});
+
+            auto block = virtual_header.cloneEmpty();
+            MutableColumns columns = block.mutateColumns();
+            for (auto & column : columns)
+                column->insertDefault();
+            block.setColumns(std::move(columns));
+
+            ASTPtr filter_ast;
+            VirtualColumnUtils::prepareFilterBlockWithQuery(query, getContext(), block, filter_ast);
+
+            if (filter_ast)
+            {
+                block = virtual_header.cloneEmpty();
+                MutableColumnPtr path_column;
+                MutableColumnPtr file_column;
+                MutableColumnPtr key_column = block.getByName("_key").column->assumeMutable();
+
+                if (block.has("_path"))
+                    path_column = block.getByName("_path").column->assumeMutable();
+
+                if (block.has("_file"))
+                    file_column = block.getByName("_file").column->assumeMutable();
+
+                for (const auto & key : keys)
+                {
+                    String path = fs::path(bucket) / key;
+                    String file = path.substr(path.find_last_of('/') + 1);
+                    if (path_column)
+                        path_column->insert(path);
+                    if (file_column)
+                        file_column->insert(file);
+                    key_column->insert(key);
+                }
+
+                VirtualColumnUtils::filterBlockWithQuery(query, block, getContext(), filter_ast);
+                const ColumnString & keys_col = typeid_cast<const ColumnString &>(*block.getByName("_key").column);
+                size_t rows = block.rows();
+                Strings filtered_keys;
+                filtered_keys.reserve(rows);
+                for (size_t i = 0; i < rows; ++i)
+                    filtered_keys.emplace_back(keys_col.getDataAt(i).toString());
+
+                keys = std::move(filtered_keys);
+            }
+        }
     }
 
     String next()
@@ -197,9 +323,15 @@ public:
 private:
     Strings keys;
     std::atomic_size_t index = 0;
+
+    String bucket;
+    ASTPtr query;
+    Block virtual_header;
 };
 
-StorageS3Source::KeysIterator::KeysIterator(const std::vector<String> & keys_) : pimpl(std::make_shared<StorageS3Source::KeysIterator::Impl>(keys_))
+StorageS3Source::KeysIterator::KeysIterator(
+    const std::vector<String> & keys_, const String & bucket_, ASTPtr query, const Block & virtual_header, ContextPtr context)
+    : pimpl(std::make_shared<StorageS3Source::KeysIterator::Impl>(keys_, bucket_, query, virtual_header, context))
 {
 }
 
@@ -260,7 +392,7 @@ StorageS3Source::StorageS3Source(
     UInt64 max_block_size_,
     UInt64 max_single_read_retries_,
     String compression_hint_,
-    const std::shared_ptr<Aws::S3::S3Client> & client_,
+    const std::shared_ptr<const Aws::S3::S3Client> & client_,
     const String & bucket_,
     const String & version_id_,
     std::shared_ptr<IteratorWrapper> file_iterator_,
@@ -397,7 +529,7 @@ Chunk StorageS3Source::generate()
     return {};
 }
 
-static bool checkIfObjectExists(const std::shared_ptr<Aws::S3::S3Client> & client, const String & bucket, const String & key)
+static bool checkIfObjectExists(const std::shared_ptr<const Aws::S3::S3Client> & client, const String & bucket, const String & key)
 {
     bool is_finished = false;
     Aws::S3::Model::ListObjectsV2Request request;
@@ -548,7 +680,6 @@ private:
     const Block sample_block;
     ContextPtr context;
     const CompressionMethod compression_method;
-
     const StorageS3::S3Configuration & s3_configuration;
     const String bucket;
     const String key;
@@ -609,6 +740,7 @@ StorageS3::StorageS3(
     , partition_by(partition_by_)
     , is_key_with_globs(uri_.key.find_first_of("*?{") != std::string::npos)
 {
+    FormatFactory::instance().checkFormatName(format_name);
     context_->getGlobalContext()->getRemoteHostFilter().checkURL(uri_.uri);
     StorageInMemoryMetadata storage_metadata;
 
@@ -639,6 +771,8 @@ StorageS3::StorageS3(
 
     auto columns = storage_metadata.getSampleBlock().getNamesAndTypesList();
     virtual_columns = getVirtualsForStorage(columns, default_virtuals);
+    for (const auto & column : virtual_columns)
+        virtual_block.insert({column.type->createColumn(), column.type, column.name});
 }
 
 std::shared_ptr<StorageS3Source::IteratorWrapper> StorageS3::createFileIterator(
@@ -647,6 +781,8 @@ std::shared_ptr<StorageS3Source::IteratorWrapper> StorageS3::createFileIterator(
     bool is_key_with_globs,
     bool distributed_processing,
     ContextPtr local_context,
+    ASTPtr query,
+    const Block & virtual_block,
     const std::vector<String> & read_tasks)
 {
     if (distributed_processing)
@@ -660,19 +796,15 @@ std::shared_ptr<StorageS3Source::IteratorWrapper> StorageS3::createFileIterator(
     else if (is_key_with_globs)
     {
         /// Iterate through disclosed globs and make a source for each file
-        auto glob_iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(*s3_configuration.client, s3_configuration.uri);
-        return std::make_shared<StorageS3Source::IteratorWrapper>([glob_iterator]()
-        {
-            return glob_iterator->next();
-        });
+        auto glob_iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
+            *s3_configuration.client, s3_configuration.uri, query, virtual_block, local_context);
+        return std::make_shared<StorageS3Source::IteratorWrapper>([glob_iterator]() { return glob_iterator->next(); });
     }
     else
     {
-        auto keys_iterator = std::make_shared<StorageS3Source::KeysIterator>(keys);
-        return std::make_shared<StorageS3Source::IteratorWrapper>([keys_iterator]()
-        {
-            return keys_iterator->next();
-        });
+        auto keys_iterator
+            = std::make_shared<StorageS3Source::KeysIterator>(keys, s3_configuration.uri.bucket, query, virtual_block, local_context);
+        return std::make_shared<StorageS3Source::IteratorWrapper>([keys_iterator]() { return keys_iterator->next(); });
     }
 }
 
@@ -684,12 +816,17 @@ bool StorageS3::supportsSubsetOfColumns() const
 Pipe StorageS3::read(
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & /*query_info*/,
+    SelectQueryInfo & query_info,
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
 {
+    bool has_wildcards = s3_configuration.uri.bucket.find(PARTITION_ID_WILDCARD) != String::npos
+        || keys.back().find(PARTITION_ID_WILDCARD) != String::npos;
+    if (partition_by && has_wildcards)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Reading from a partitioned S3 storage is not implemented yet");
+
     updateS3Configuration(local_context, s3_configuration);
 
     Pipes pipes;
@@ -703,7 +840,15 @@ Pipe StorageS3::read(
             requested_virtual_columns.push_back(virtual_column);
     }
 
-    std::shared_ptr<StorageS3Source::IteratorWrapper> iterator_wrapper = createFileIterator(s3_configuration, keys, is_key_with_globs, distributed_processing, local_context, read_tasks_used_in_schema_inference);
+    std::shared_ptr<StorageS3Source::IteratorWrapper> iterator_wrapper = createFileIterator(
+        s3_configuration,
+        keys,
+        is_key_with_globs,
+        distributed_processing,
+        local_context,
+        query_info.query,
+        virtual_block,
+        read_tasks_used_in_schema_inference);
 
     ColumnsDescription columns_description;
     Block block_for_format;
@@ -878,7 +1023,8 @@ void StorageS3::updateS3Configuration(ContextPtr ctx, StorageS3::S3Configuration
 
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
         settings.auth_settings.region,
-        ctx->getRemoteHostFilter(), ctx->getGlobalContext()->getSettingsRef().s3_max_redirects);
+        ctx->getRemoteHostFilter(), ctx->getGlobalContext()->getSettingsRef().s3_max_redirects,
+        ctx->getGlobalContext()->getSettingsRef().enable_s3_requests_logging);
 
     client_configuration.endpointOverride = upd.uri.endpoint;
     client_configuration.maxConnections = upd.rw_settings.max_connections;
@@ -999,7 +1145,8 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
     ContextPtr ctx,
     std::vector<String> * read_keys_in_distributed_processing)
 {
-    auto file_iterator = createFileIterator(s3_configuration, {s3_configuration.uri.key}, is_key_with_globs, distributed_processing, ctx);
+    auto file_iterator
+        = createFileIterator(s3_configuration, {s3_configuration.uri.key}, is_key_with_globs, distributed_processing, ctx, nullptr, {});
 
     ReadBufferIterator read_buffer_iterator = [&, first = false]() mutable -> std::unique_ptr<ReadBuffer>
     {
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index 102f74b83cd..b246de18bfb 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -34,25 +34,33 @@ class StorageS3Source : public SourceWithProgress, WithContext
 public:
     class DisclosedGlobIterator
     {
-        public:
-            DisclosedGlobIterator(Aws::S3::S3Client &, const S3::URI &);
-            String next();
-        private:
-            class Impl;
-            /// shared_ptr to have copy constructor
-            std::shared_ptr<Impl> pimpl;
+    public:
+        DisclosedGlobIterator(
+            const Aws::S3::S3Client & client_,
+            const S3::URI & globbed_uri_,
+            ASTPtr query,
+            const Block & virtual_header,
+            ContextPtr context);
+
+        String next();
+
+    private:
+        class Impl;
+        /// shared_ptr to have copy constructor
+        std::shared_ptr<Impl> pimpl;
     };
 
     class KeysIterator
     {
-        public:
-            explicit KeysIterator(const std::vector<String> & keys_);
-            String next();
+    public:
+        explicit KeysIterator(
+            const std::vector<String> & keys_, const String & bucket_, ASTPtr query, const Block & virtual_header, ContextPtr context);
+        String next();
 
-        private:
-            class Impl;
-            /// shared_ptr to have copy constructor
-            std::shared_ptr<Impl> pimpl;
+    private:
+        class Impl;
+        /// shared_ptr to have copy constructor
+        std::shared_ptr<Impl> pimpl;
     };
 
     class ReadTasksIterator
@@ -82,7 +90,7 @@ public:
         UInt64 max_block_size_,
         UInt64 max_single_read_retries_,
         String compression_hint_,
-        const std::shared_ptr<Aws::S3::S3Client> & client_,
+        const std::shared_ptr<const Aws::S3::S3Client> & client_,
         const String & bucket,
         const String & version_id,
         std::shared_ptr<IteratorWrapper> file_iterator_,
@@ -104,7 +112,7 @@ private:
     UInt64 max_block_size;
     UInt64 max_single_read_retries;
     String compression_hint;
-    std::shared_ptr<Aws::S3::S3Client> client;
+    std::shared_ptr<const Aws::S3::S3Client> client;
     Block sample_block;
     std::optional<FormatSettings> format_settings;
 
@@ -191,7 +199,7 @@ public:
         const S3::URI uri;
         const String access_key_id;
         const String secret_access_key;
-        std::shared_ptr<Aws::S3::S3Client> client;
+        std::shared_ptr<const Aws::S3::S3Client> client;
         S3Settings::AuthSettings auth_settings;
         S3Settings::ReadWriteSettings rw_settings;
     };
@@ -203,6 +211,7 @@ private:
     S3Configuration s3_configuration;
     std::vector<String> keys;
     NamesAndTypesList virtual_columns;
+    Block virtual_block;
 
     String format_name;
     String compression_method;
@@ -222,6 +231,8 @@ private:
         bool is_key_with_globs,
         bool distributed_processing,
         ContextPtr local_context,
+        ASTPtr query,
+        const Block & virtual_block,
         const std::vector<String> & read_tasks = {});
 
     static ColumnsDescription getTableStructureFromDataImpl(
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index c0631311d8c..13be199bd37 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -30,6 +30,7 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Storages/getVirtualsForStorage.h>
 #include <Common/logger_useful.h>
 
 #include <aws/core/auth/AWSCredentials.h>
@@ -82,6 +83,15 @@ StorageS3Cluster::StorageS3Cluster(
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
+
+    auto default_virtuals = NamesAndTypesList{
+        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
+        {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
+
+    auto columns = storage_metadata.getSampleBlock().getNamesAndTypesList();
+    virtual_columns = getVirtualsForStorage(columns, default_virtuals);
+    for (const auto & column : virtual_columns)
+        virtual_block.insert({column.type->createColumn(), column.type, column.name});
 }
 
 /// The code executes on initiator
@@ -98,11 +108,9 @@ Pipe StorageS3Cluster::read(
 
     auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
 
-    auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(*s3_configuration.client, s3_configuration.uri);
-    auto callback = std::make_shared<StorageS3Source::IteratorWrapper>([iterator]() mutable -> String
-    {
-        return iterator->next();
-    });
+    auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
+        *s3_configuration.client, s3_configuration.uri, query_info.query, virtual_block, context);
+    auto callback = std::make_shared<StorageS3Source::IteratorWrapper>([iterator]() mutable -> String { return iterator->next(); });
 
     /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
     Block header =
@@ -164,9 +172,7 @@ QueryProcessingStage::Enum StorageS3Cluster::getQueryProcessingStage(
 
 NamesAndTypesList StorageS3Cluster::getVirtuals() const
 {
-    return NamesAndTypesList{
-        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
+    return virtual_columns;
 }
 
 
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index 5470dda3e97..f823d1fdf04 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -49,6 +49,8 @@ private:
     String cluster_name;
     String format_name;
     String compression_method;
+    NamesAndTypesList virtual_columns;
+    Block virtual_block;
 };
 
 
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 14931a6b230..062241797e0 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -74,6 +74,7 @@ IStorageURLBase::IStorageURLBase(
     , http_method(http_method_)
     , partition_by(partition_by_)
 {
+    FormatFactory::instance().checkFormatName(format_name);
     StorageInMemoryMetadata storage_metadata;
 
     if (columns_.empty())
diff --git a/src/Storages/System/StorageSystemDictionaries.cpp b/src/Storages/System/StorageSystemDictionaries.cpp
index c0d7d8cc4ed..5d6f288ab11 100644
--- a/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/src/Storages/System/StorageSystemDictionaries.cpp
@@ -35,6 +35,7 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
         {"attribute.names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"attribute.types", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"bytes_allocated", std::make_shared<DataTypeUInt64>()},
+        {"hierarchical_index_bytes_allocated", std::make_shared<DataTypeUInt64>()},
         {"query_count", std::make_shared<DataTypeUInt64>()},
         {"hit_rate", std::make_shared<DataTypeFloat64>()},
         {"found_rate", std::make_shared<DataTypeFloat64>()},
@@ -113,6 +114,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPt
         if (dict_ptr)
         {
             res_columns[i++]->insert(dict_ptr->getBytesAllocated());
+            res_columns[i++]->insert(dict_ptr->getHierarchicalIndexBytesAllocated());
             res_columns[i++]->insert(dict_ptr->getQueryCount());
             res_columns[i++]->insert(dict_ptr->getHitRate());
             res_columns[i++]->insert(dict_ptr->getFoundRate());
@@ -128,7 +130,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPt
         }
         else
         {
-            for (size_t j = 0; j != 9; ++j) // Number of empty fields if dict_ptr is null
+            for (size_t j = 0; j != 10; ++j) // Number of empty fields if dict_ptr is null
                 res_columns[i++]->insertDefault();
         }
 
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index fb6a055c6e5..5cc79c1ceee 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -1,7 +1,6 @@
 #include <Storages/System/StorageSystemDisks.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Interpreters/Context.h>
-#include <Disks/IDiskRemote.h>
 
 namespace DB
 {
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index d0840778c0f..40cf650f690 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -156,8 +156,13 @@ bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block
         auto actions = std::make_shared<ActionsDAG>(block.getColumnsWithTypeAndName());
         PreparedSets prepared_sets;
         SubqueriesForSets subqueries_for_sets;
+        const NamesAndTypesList source_columns;
+        const NamesAndTypesList aggregation_keys;
+        const ColumnNumbersList grouping_set_keys;
+
         ActionsVisitor::Data visitor_data(
-            context, SizeLimits{}, 1, {}, std::move(actions), prepared_sets, subqueries_for_sets, true, true, true, false);
+            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, subqueries_for_sets, true, true, true, false,
+            { aggregation_keys, grouping_set_keys, GroupByKind::NONE });
         ActionsVisitor(visitor_data).visit(node);
         actions = visitor_data.getActions();
         auto expression_actions = std::make_shared<ExpressionActions>(actions);
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index a44b8954e3c..0f4d5885d19 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -81,20 +81,18 @@ namespace ErrorCodes
 namespace
 {
     /// Fetch all window info and replace tumble or hop node names with windowID
-    struct FetchQueryInfoMatcher
+    struct WindowFunctionMatcher
     {
-        using Visitor = InDepthNodeVisitor<FetchQueryInfoMatcher, true>;
+        using Visitor = InDepthNodeVisitor<WindowFunctionMatcher, true>;
         using TypeToVisit = ASTFunction;
 
         struct Data
         {
             ASTPtr window_function;
-            String window_id_name;
-            String window_id_alias;
             String serialized_window_function;
-            String timestamp_column_name;
             bool is_tumble = false;
             bool is_hop = false;
+            bool check_duplicate_window = false;
         };
 
         static bool needChildVisit(ASTPtr &, const ASTPtr &) { return true; }
@@ -111,18 +109,17 @@ namespace
                     temp_node->setAlias("");
                     if (!data.window_function)
                     {
-                        data.serialized_window_function = serializeAST(*temp_node);
+                        if (data.check_duplicate_window)
+                            data.serialized_window_function = serializeAST(*temp_node);
                         t->name = "windowID";
-                        data.window_id_name = t->getColumnName();
-                        data.window_id_alias = t->alias;
                         data.window_function = t->clone();
                         data.window_function->setAlias("");
-                        data.timestamp_column_name = t->arguments->children[0]->getColumnName();
                     }
                     else
                     {
-                        if (serializeAST(*temp_node) != data.serialized_window_function)
-                            throw Exception("WINDOW VIEW only support ONE TIME WINDOW FUNCTION", ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_WINDOW_VIEW);
+                        if (data.check_duplicate_window && serializeAST(*temp_node) != data.serialized_window_function)
+                            throw Exception(
+                                "WINDOW VIEW only support ONE TIME WINDOW FUNCTION", ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_WINDOW_VIEW);
                         t->name = "windowID";
                     }
                 }
@@ -190,24 +187,6 @@ namespace
 
     using ReplaceFunctionNowVisitor = InDepthNodeVisitor<OneTypeMatcher<ReplaceFunctionNowData>, true>;
 
-    struct ReplaceFunctionWindowMatcher
-    {
-        using Visitor = InDepthNodeVisitor<ReplaceFunctionWindowMatcher, true>;
-
-        struct Data{};
-
-        static bool needChildVisit(ASTPtr &, const ASTPtr &) { return true; }
-
-        static void visit(ASTPtr & ast, Data &)
-        {
-            if (auto * t = ast->as<ASTFunction>())
-            {
-                if (t->name == "hop" || t->name == "tumble")
-                    t->name = "windowID";
-            }
-        }
-    };
-
     class ToIdentifierMatcher
     {
     public:
@@ -267,7 +246,7 @@ namespace
         {
             if (auto * t = ast->as<ASTIdentifier>())
             {
-                ast = std::make_shared<ASTIdentifier>(t->shortName());
+                t->setShortName(t->shortName());
             }
         }
     };
@@ -420,7 +399,7 @@ ASTPtr StorageWindowView::getCleanupQuery()
     ASTPtr function_less;
     function_less= makeASTFunction(
         "less",
-        std::make_shared<ASTIdentifier>(inner_window_id_column_name),
+        std::make_shared<ASTIdentifier>(window_id_name),
         std::make_shared<ASTLiteral>(getCleanupBound()));
 
     auto alter_query = std::make_shared<ASTAlterQuery>();
@@ -535,7 +514,7 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
     {
         /// SELECT * FROM inner_table WHERE window_id_name == w_end
         /// (because we fire at the end of windows)
-        filter_function = makeASTFunction("equals", std::make_shared<ASTIdentifier>(inner_window_id_column_name), std::make_shared<ASTLiteral>(watermark));
+        filter_function = makeASTFunction("equals", std::make_shared<ASTIdentifier>(window_id_name), std::make_shared<ASTLiteral>(watermark));
     }
     else
     {
@@ -554,7 +533,7 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
             func_array ->arguments->children.push_back(std::make_shared<ASTLiteral>(w_end));
             w_end = addTime(w_end, window_kind, -slice_num_units, *time_zone);
         }
-        filter_function = makeASTFunction("has", func_array, std::make_shared<ASTIdentifier>(inner_window_id_column_name));
+        filter_function = makeASTFunction("has", func_array, std::make_shared<ASTIdentifier>(window_id_name));
     }
 
     auto syntax_result = TreeRewriter(getContext()).analyze(filter_function, builder.getHeader().getNamesAndTypesList());
@@ -569,7 +548,7 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
     /// Adding window column
     DataTypes window_column_type{std::make_shared<DataTypeDateTime>(), std::make_shared<DataTypeDateTime>()};
     ColumnWithTypeAndName column;
-    column.name = inner_window_column_name;
+    column.name = window_column_name;
     column.type = std::make_shared<DataTypeTuple>(std::move(window_column_type));
     column.column = column.type->createColumnConst(0, Tuple{w_start, watermark});
     auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
@@ -582,7 +561,7 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
 
     /// Removing window id column
     auto new_header = builder.getHeader();
-    new_header.erase(inner_window_id_column_name);
+    new_header.erase(window_id_name);
     auto convert_actions_dag = ActionsDAG::makeConvertingActions(
         builder.getHeader().getColumnsWithTypeAndName(),
         new_header.getColumnsWithTypeAndName(),
@@ -736,15 +715,14 @@ ASTPtr StorageWindowView::getSourceTableSelectQuery()
     {
         auto query = select_query->clone();
         DropTableIdentifierMatcher::Data drop_table_identifier_data;
-        DropTableIdentifierMatcher::Visitor drop_table_identifier_visitor(drop_table_identifier_data);
-        drop_table_identifier_visitor.visit(query);
+        DropTableIdentifierMatcher::Visitor(drop_table_identifier_data).visit(query);
 
-        FetchQueryInfoMatcher::Data query_info_data;
-        FetchQueryInfoMatcher::Visitor(query_info_data).visit(query);
+        WindowFunctionMatcher::Data query_info_data;
+        WindowFunctionMatcher::Visitor(query_info_data).visit(query);
 
         auto order_by = std::make_shared<ASTExpressionList>();
         auto order_by_elem = std::make_shared<ASTOrderByElement>();
-        order_by_elem->children.push_back(std::make_shared<ASTIdentifier>(query_info_data.timestamp_column_name));
+        order_by_elem->children.push_back(std::make_shared<ASTIdentifier>(timestamp_column_name));
         order_by_elem->direction = 1;
         order_by->children.push_back(order_by_elem);
         modified_select.setExpression(ASTSelectQuery::Expression::ORDER_BY, std::move(order_by));
@@ -778,7 +756,7 @@ ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, c
         = InterpreterSelectQuery(inner_select_query, getContext(), SelectQueryOptions(QueryProcessingStage::WithMergeableState))
               .getSampleBlock();
 
-    auto columns_list = std::make_shared<ASTExpressionList>();
+    ASTPtr columns_list = InterpreterCreateQuery::formatColumns(t_sample_block.getNamesAndTypesList());
 
     if (is_time_column_func_now)
     {
@@ -786,31 +764,8 @@ ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, c
         column_window->name = window_id_name;
         column_window->type = std::make_shared<ASTIdentifier>("UInt32");
         columns_list->children.push_back(column_window);
-        inner_window_id_column_name = window_id_name;
     }
 
-    for (const auto & column : t_sample_block.getColumnsWithTypeAndName())
-    {
-        ParserIdentifierWithOptionalParameters parser;
-        String sql = column.type->getName();
-        ASTPtr ast = parseQuery(parser, sql.data(), sql.data() + sql.size(), "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-        auto column_dec = std::make_shared<ASTColumnDeclaration>();
-        column_dec->name = column.name;
-        column_dec->type = ast;
-        columns_list->children.push_back(column_dec);
-        if (!is_time_column_func_now && inner_window_id_column_name.empty() && startsWith(column.name, "windowID"))
-        {
-            inner_window_id_column_name = column.name;
-        }
-    }
-
-    if (inner_window_id_column_name.empty())
-        throw Exception(
-            "The first argument of time window function should not be a constant value.",
-            ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_WINDOW_VIEW);
-
-    inner_window_column_name = std::regex_replace(inner_window_id_column_name, std::regex("windowID"), is_tumble ? "tumble" : "hop");
-
     ToIdentifierMatcher::Data query_data;
     query_data.window_id_name = window_id_name;
     query_data.window_id_alias = window_id_alias;
@@ -818,8 +773,8 @@ ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, c
 
     ReplaceFunctionNowData time_now_data;
     ReplaceFunctionNowVisitor time_now_visitor(time_now_data);
-    ReplaceFunctionWindowMatcher::Data func_hop_data;
-    ReplaceFunctionWindowMatcher::Visitor func_window_visitor(func_hop_data);
+    WindowFunctionMatcher::Data window_data;
+    WindowFunctionMatcher::Visitor window_visitor(window_data);
 
     DropTableIdentifierMatcher::Data drop_table_identifier_data;
     DropTableIdentifierMatcher::Visitor drop_table_identifier_visitor(drop_table_identifier_data);
@@ -836,7 +791,7 @@ ASTPtr StorageWindowView::getInnerTableCreateQuery(const ASTPtr & inner_query, c
         }
         drop_table_identifier_visitor.visit(node);
         /// tumble/hop -> windowID
-        func_window_visitor.visit(node);
+        window_visitor.visit(node);
         to_identifier_visitor.visit(node);
         node->setAlias("");
         return node;
@@ -1315,6 +1270,8 @@ ASTPtr StorageWindowView::initInnerQuery(ASTSelectQuery query, ContextPtr contex
     if (is_time_column_func_now)
         window_id_name = func_now_data.window_id_name;
 
+    window_column_name = std::regex_replace(window_id_name, std::regex("windowID"), is_tumble ? "tumble" : "hop");
+
     /// Parse final query (same as mergeable query but has tumble/hop instead of windowID)
     final_query = mergeable_query->clone();
     ReplaceWindowIdMatcher::Data final_query_data;
@@ -1331,16 +1288,15 @@ ASTPtr StorageWindowView::innerQueryParser(const ASTSelectQuery & query)
 
     // Parse stage mergeable
     ASTPtr result = query.clone();
-    FetchQueryInfoMatcher::Data query_info_data;
-    FetchQueryInfoMatcher::Visitor(query_info_data).visit(result);
+
+    WindowFunctionMatcher::Data query_info_data;
+    query_info_data.check_duplicate_window = true;
+    WindowFunctionMatcher::Visitor(query_info_data).visit(result);
 
     if (!query_info_data.is_tumble && !query_info_data.is_hop)
         throw Exception(ErrorCodes::INCORRECT_QUERY,
                         "TIME WINDOW FUNCTION is not specified for {}", getName());
 
-    window_id_name = query_info_data.window_id_name;
-    window_id_alias = query_info_data.window_id_alias;
-    timestamp_column_name = query_info_data.timestamp_column_name;
     is_tumble = query_info_data.is_tumble;
 
     // Parse time window function
@@ -1350,6 +1306,14 @@ 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");
 
+    window_id_alias = window_function.alias;
+    if (auto * node = arguments[0]->as<ASTIdentifier>())
+        timestamp_column_name = node->shortName();
+
+    DropTableIdentifierMatcher::Data drop_identifier_data;
+    DropTableIdentifierMatcher::Visitor(drop_identifier_data).visit(query_info_data.window_function);
+    window_id_name = window_function.getColumnName();
+
     slide_kind = window_kind;
     slide_num_units = window_num_units;
 
@@ -1614,31 +1578,6 @@ void StorageWindowView::writeIntoWindowView(
 
 void StorageWindowView::startup()
 {
-    if (is_time_column_func_now)
-        inner_window_id_column_name = window_id_name;
-    else
-    {
-        Aliases aliases;
-        QueryAliasesVisitor(aliases).visit(mergeable_query);
-        auto inner_query_normalized = mergeable_query->clone();
-        QueryNormalizer::Data normalizer_data(aliases, {}, false, getContext()->getSettingsRef(), false);
-        QueryNormalizer(normalizer_data).visit(inner_query_normalized);
-        auto inner_select_query = std::static_pointer_cast<ASTSelectQuery>(inner_query_normalized);
-        auto t_sample_block
-            = InterpreterSelectQuery(inner_select_query, getContext(), SelectQueryOptions(QueryProcessingStage::WithMergeableState))
-                    .getSampleBlock();
-        for (const auto & column : t_sample_block.getColumnsWithTypeAndName())
-        {
-            if (startsWith(column.name, "windowID"))
-            {
-                inner_window_id_column_name = column.name;
-                break;
-            }
-        }
-    }
-
-    inner_window_column_name = std::regex_replace(inner_window_id_column_name, std::regex("windowID"), is_tumble ? "tumble" : "hop");
-
     DatabaseCatalog::instance().addDependency(select_table_id, getStorageID());
 
     // Start the working thread
diff --git a/src/Storages/WindowView/StorageWindowView.h b/src/Storages/WindowView/StorageWindowView.h
index d9343aa03ac..b639a5924ad 100644
--- a/src/Storages/WindowView/StorageWindowView.h
+++ b/src/Storages/WindowView/StorageWindowView.h
@@ -238,8 +238,7 @@ private:
     Int64 slide_num_units;
     String window_id_name;
     String window_id_alias;
-    String inner_window_column_name;
-    String inner_window_id_column_name;
+    String window_column_name;
     String timestamp_column_name;
 
     StorageID select_table_id = StorageID::createEmpty();
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index f8397bf3e76..9730ac2cc46 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -9,7 +9,7 @@ import time
 from shutil import rmtree
 from typing import List, Optional, Tuple
 
-from env_helper import REPO_COPY, TEMP_PATH, CACHES_PATH, IMAGES_PATH
+from env_helper import GITHUB_JOB, REPO_COPY, TEMP_PATH, CACHES_PATH, IMAGES_PATH
 from s3_helper import S3Helper
 from pr_info import PRInfo
 from version_helper import (
@@ -138,6 +138,7 @@ def create_json_artifact(
         "build_config": build_config,
         "elapsed_seconds": elapsed,
         "status": success,
+        "job_name": GITHUB_JOB,
     }
 
     json_name = "build_urls_" + build_name + ".json"
diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
index 44cc45390a5..b2d54eadd60 100644
--- a/tests/ci/build_report_check.py
+++ b/tests/ci/build_report_check.py
@@ -9,11 +9,11 @@ from typing import Dict, List, Tuple
 from github import Github
 
 from env_helper import (
+    GITHUB_REPOSITORY,
+    GITHUB_RUN_URL,
+    GITHUB_SERVER_URL,
     REPORTS_PATH,
     TEMP_PATH,
-    GITHUB_REPOSITORY,
-    GITHUB_SERVER_URL,
-    GITHUB_RUN_URL,
 )
 from report import create_build_html_report
 from s3_helper import S3Helper
@@ -24,6 +24,9 @@ from ci_config import CI_CONFIG
 from rerun_helper import RerunHelper
 
 
+NEEDS_DATA_PATH = os.getenv("NEEDS_DATA_PATH")
+
+
 class BuildResult:
     def __init__(
         self,
@@ -76,6 +79,23 @@ def group_by_artifacts(build_urls: List[str]) -> Dict[str, List[str]]:
     return groups
 
 
+def get_failed_report(
+    job_name: str,
+) -> Tuple[List[BuildResult], List[List[str]], List[str]]:
+    message = f"{job_name} failed"
+    build_result = BuildResult(
+        compiler="unknown",
+        build_type="unknown",
+        sanitizer="unknown",
+        bundled="unknown",
+        splitted="unknown",
+        status=message,
+        elapsed_seconds=0,
+        with_coverage=False,
+    )
+    return [build_result], [[""]], [""]
+
+
 def process_report(
     build_report,
 ) -> Tuple[List[BuildResult], List[List[str]], List[str]]:
@@ -117,15 +137,19 @@ def get_build_name_from_file_name(file_name):
 
 def main():
     logging.basicConfig(level=logging.INFO)
-    reports_path = REPORTS_PATH
     temp_path = TEMP_PATH
-    logging.info("Reports path %s", reports_path)
+    logging.info("Reports path %s", REPORTS_PATH)
 
     if not os.path.exists(temp_path):
         os.makedirs(temp_path)
 
     build_check_name = sys.argv[1]
-    required_builds = int(sys.argv[2]) if len(sys.argv) > 2 else 0
+    needs_data = None
+    required_builds = 0
+    if os.path.exists(NEEDS_DATA_PATH):
+        with open(NEEDS_DATA_PATH, "rb") as file_handler:
+            needs_data = json.load(file_handler)
+            required_builds = len(needs_data)
 
     gh = Github(get_best_robot_token())
     pr_info = PRInfo()
@@ -140,7 +164,7 @@ def main():
 
     # Collect reports from json artifacts
     builds_report_map = {}
-    for root, _, files in os.walk(reports_path):
+    for root, _, files in os.walk(REPORTS_PATH):
         for f in files:
             if f.startswith("build_urls_") and f.endswith(".json"):
                 logging.info("Found build report json %s", f)
@@ -163,12 +187,18 @@ def main():
     ]
 
     some_builds_are_missing = len(build_reports) < required_builds
+    missing_build_names = []
     if some_builds_are_missing:
         logging.warning(
             "Expected to get %s build results, got only %s",
             required_builds,
             len(build_reports),
         )
+        missing_build_names = [
+            name
+            for name in needs_data
+            if not any(rep for rep in build_reports if rep["job_name"] == name)
+        ]
     else:
         logging.info("Got exactly %s builds", len(builds_report_map))
 
@@ -186,6 +216,14 @@ def main():
         build_artifacts.extend(build_artifacts_url)
         build_logs.extend(build_logs_url)
 
+    for failed_job in missing_build_names:
+        build_result, build_artifacts_url, build_logs_url = get_failed_report(
+            failed_job
+        )
+        build_results.extend(build_result)
+        build_artifacts.extend(build_artifacts_url)
+        build_logs.extend(build_logs_url)
+
     total_groups = len(build_results)
     logging.info("Totally got %s artifact groups", total_groups)
     if total_groups == 0:
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 33430c11a53..df013af8141 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -274,7 +274,6 @@ CI_CONFIG = {
         },
         "Stateless tests (release, s3 storage, actions)": {
             "required_build": "package_release",
-            "force_tests": True,
         },
         "Stress test (address, actions)": {
             "required_build": "package_asan",
diff --git a/tests/ci/env_helper.py b/tests/ci/env_helper.py
index c97c6298acc..dd081523db1 100644
--- a/tests/ci/env_helper.py
+++ b/tests/ci/env_helper.py
@@ -5,11 +5,12 @@ module_dir = p.abspath(p.dirname(__file__))
 git_root = p.abspath(p.join(module_dir, "..", ".."))
 
 CI = bool(os.getenv("CI"))
-TEMP_PATH = os.getenv("TEMP_PATH", module_dir)
+TEMP_PATH = os.getenv("TEMP_PATH", p.abspath(p.join(module_dir, "./tmp")))
 
 CACHES_PATH = os.getenv("CACHES_PATH", TEMP_PATH)
 CLOUDFLARE_TOKEN = os.getenv("CLOUDFLARE_TOKEN")
 GITHUB_EVENT_PATH = os.getenv("GITHUB_EVENT_PATH", "")
+GITHUB_JOB = os.getenv("GITHUB_JOB", "local")
 GITHUB_REPOSITORY = os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse")
 GITHUB_RUN_ID = os.getenv("GITHUB_RUN_ID", "0")
 GITHUB_SERVER_URL = os.getenv("GITHUB_SERVER_URL", "https://github.com")
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index af16c1b68c3..6516a67d333 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -44,7 +44,6 @@ def get_additional_envs(check_name, run_by_hash_num, run_by_hash_total):
     if "wide parts enabled" in check_name:
         result.append("USE_POLYMORPHIC_PARTS=1")
 
-    # temporary
     if "s3 storage" in check_name:
         result.append("USE_S3_STORAGE_FOR_MERGE_TREE=1")
 
diff --git a/tests/ci/report.py b/tests/ci/report.py
index c79a5406998..83d89e628a2 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -8,20 +8,7 @@ HTML_BASE_TEST_TEMPLATE = """
 <!DOCTYPE html>
 <html>
   <style>
-@font-face {{
-    font-family:'Yandex Sans Display Web';
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot);
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot?#iefix) format('embedded-opentype'),
-            url(https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2) format('woff2'),
-            url(https://yastatic.net/adv-www/_/v2Sve_obH3rKm6rKrtSQpf-eB7U.woff) format('woff'),
-            url(https://yastatic.net/adv-www/_/PzD8hWLMunow5i3RfJ6WQJAL7aI.ttf) format('truetype'),
-            url(https://yastatic.net/adv-www/_/lF_KG5g4tpQNlYIgA0e77fBSZ5s.svg#YandexSansDisplayWeb-Regular) format('svg');
-    font-weight:400;
-    font-style:normal;
-    font-stretch:normal
-}}
-
-body {{ font-family: "Yandex Sans Display Web", Arial, sans-serif; background: #EEE; }}
+body {{ font-family: "DejaVu Sans", "Noto Sans", Arial, sans-serif; background: #EEE; }}
 h1 {{ margin-left: 10px; }}
 th, td {{ border: 0; padding: 5px 10px 5px 10px; text-align: left; vertical-align: top; line-height: 1.5; background-color: #FFF;
 td {{ white-space: pre; font-family: Monospace, Courier New; }}
@@ -29,7 +16,6 @@ border: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0,
 a {{ color: #06F; text-decoration: none; }}
 a:hover, a:active {{ color: #F40; text-decoration: underline; }}
 table {{ border: 0; }}
-.main {{ margin-left: 10%; }}
 p.links a {{ padding: 5px; margin: 3px; background: #FFF; line-height: 2; white-space: nowrap; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }}
 th {{ cursor: pointer; }}
 .failed {{ cursor: pointer; }}
@@ -179,6 +165,11 @@ def create_test_html_report(
         num_fails = 0
         has_test_time = False
         has_test_logs = False
+
+        if with_raw_logs:
+            # Display entires with logs at the top (they correspond to failed tests)
+            test_result.sort(key=lambda result: len(result) <= 3)
+
         for result in test_result:
             test_name = result[0]
             test_status = result[1]
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index c4ad314ff9e..355f7b7a712 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -55,7 +55,6 @@ MESSAGES_TO_RETRY = [
     "DB::Exception: New table appeared in database being dropped or detached. Try again",
     "is already started to be removing by another replica right now",
     "DB::Exception: Cannot enqueue query",
-    "line 1: wait_for: No record of process",  # Something weird from bash internals, let's just retry
     "is executing longer than distributed_ddl_task_timeout",  # FIXME
 ]
 
@@ -243,37 +242,6 @@ def get_transactions_list(args):
         return f"Cannot get list of transactions: {e}"
 
 
-def get_processlist_after_test(args):
-    log_comment = args.testcase_basename
-    database = args.testcase_database
-    if args.replicated_database:
-        return clickhouse_execute_json(
-            args,
-            f"""
-        SELECT materialize((hostName(), tcpPort())) as host, *
-        FROM clusterAllReplicas('test_cluster_database_replicated', system.processes)
-        WHERE
-            query NOT LIKE '%system.processes%' AND
-            {'NOT is_all_data_sent AND' if args.suppport_system_processes_is_all_data_sent else ''}
-            Settings['log_comment'] = '{log_comment}' AND
-            current_database = '{database}'
-        """,
-        )
-    else:
-        return clickhouse_execute_json(
-            args,
-            f"""
-        SELECT *
-        FROM system.processes
-        WHERE
-            query NOT LIKE '%system.processes%' AND
-            {'NOT is_all_data_sent AND' if args.suppport_system_processes_is_all_data_sent else ''}
-            Settings['log_comment'] = '{log_comment}' AND
-            current_database = '{database}'
-        """,
-        )
-
-
 # collect server stacktraces using gdb
 def get_stacktraces_from_gdb(server_pid):
     try:
@@ -406,7 +374,6 @@ class FailureReason(enum.Enum):
     RESULT_DIFF = "result differs with reference: "
     TOO_LONG = "Test runs too long (> 60s). Make it faster."
     INTERNAL_QUERY_FAIL = "Internal query (CREATE/DROP DATABASE) failed:"
-    LEFT_QUERIES = "Queries left in background after the test finished:"
 
     # SKIPPED reasons
     DISABLED = "disabled"
@@ -859,21 +826,6 @@ class TestCase:
                 description,
             )
 
-        left_queries_check = args.no_left_queries_check is False
-        if self.tags and "no-left-queries-check" in self.tags:
-            left_queries_check = False
-        if left_queries_check:
-            processlist = get_processlist_after_test(self.testcase_args)
-            if processlist:
-                description += f"\n{json.dumps(processlist, indent=4)}\n"
-                return TestResult(
-                    self.name,
-                    TestStatus.FAIL,
-                    FailureReason.LEFT_QUERIES,
-                    total_time,
-                    description,
-                )
-
         if os.path.exists(self.stdout_file):
             os.remove(self.stdout_file)
         if os.path.exists(self.stderr_file):
diff --git a/tests/config/config.d/logger.xml b/tests/config/config.d/logger_test.xml
similarity index 100%
rename from tests/config/config.d/logger.xml
rename to tests/config/config.d/logger_test.xml
diff --git a/tests/config/config.d/logger_trace.xml b/tests/config/config.d/logger_trace.xml
new file mode 100644
index 00000000000..2c95dcf8fe5
--- /dev/null
+++ b/tests/config/config.d/logger_trace.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <logger>
+        <level>trace</level>
+    </logger>
+</clickhouse>
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index 45fad002c88..b22225163f8 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -22,6 +22,17 @@
                 <data_cache_max_size>22548578304</data_cache_max_size>
                 <cache_on_write_operations>0</cache_on_write_operations>
             </s3_cache_2>
+            <s3_cache_3>
+                <type>s3</type>
+                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+                <data_cache_enabled>1</data_cache_enabled>
+                <cache_enabled>0</cache_enabled>
+                <data_cache_max_size>22548578304</data_cache_max_size>
+                <cache_on_write_operations>1</cache_on_write_operations>
+                <enable_cache_hits_threshold>1</enable_cache_hits_threshold>
+            </s3_cache_3>
         </disks>
         <policies>
             <s3_cache>
@@ -38,6 +49,13 @@
                     </main>
                 </volumes>
             </s3_cache_2>
+            <s3_cache_3>
+                <volumes>
+                    <main>
+                        <disk>s3_cache_3</disk>
+                    </main>
+                </volumes>
+            </s3_cache_3>
         </policies>
     </storage_configuration>
 </clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 3bc1967ab1f..fb015b4f931 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -40,7 +40,7 @@ ln -sf $SRC_PATH/config.d/transactions.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/encryption.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/CORS.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/zookeeper_log.xml $DEST_SERVER_PATH/config.d/
-ln -sf $SRC_PATH/config.d/logger.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/logger_test.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/named_collection.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/ssl_certs.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/filesystem_cache_log.xml $DEST_SERVER_PATH/config.d/
@@ -87,6 +87,9 @@ fi
 
 if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TREE" -eq 1 ]]; then
     ln -sf $SRC_PATH/config.d/s3_storage_policy_by_default.xml $DEST_SERVER_PATH/config.d/
+    # Too verbose logging in S3 tests
+    rm -f $DEST_SERVER_PATH/config.d/logger_test.xml
+    ln -sf $SRC_PATH/config.d/logger_trace.xml $DEST_SERVER_PATH/config.d/
 fi
 
 if [[ -n "$EXPORT_S3_STORAGE_POLICIES" ]]; then
diff --git a/tests/integration/test_allowed_url_from_config/test.py b/tests/integration/test_allowed_url_from_config/test.py
index 01a2a500ebf..da9d4404c82 100644
--- a/tests/integration/test_allowed_url_from_config/test.py
+++ b/tests/integration/test_allowed_url_from_config/test.py
@@ -33,7 +33,7 @@ def start_cluster():
 def test_config_with_hosts(start_cluster):
     assert (
         node1.query(
-            "CREATE TABLE table_test_1_1 (word String) Engine=URL('http://host:80', HDFS)"
+            "CREATE TABLE table_test_1_1 (word String) Engine=URL('http://host:80', CSV)"
         )
         == ""
     )
@@ -44,7 +44,7 @@ def test_config_with_hosts(start_cluster):
         == ""
     )
     assert "not allowed" in node1.query_and_get_error(
-        "CREATE TABLE table_test_1_4 (word String) Engine=URL('https://host:123', S3)"
+        "CREATE TABLE table_test_1_4 (word String) Engine=URL('https://host:123', CSV)"
     )
     assert "not allowed" in node1.query_and_get_error(
         "CREATE TABLE table_test_1_4 (word String) Engine=URL('https://yandex2.ru', CSV)"
@@ -60,7 +60,7 @@ def test_config_with_only_primary_hosts(start_cluster):
     )
     assert (
         node2.query(
-            "CREATE TABLE table_test_2_2 (word String) Engine=URL('https://host:123', S3)"
+            "CREATE TABLE table_test_2_2 (word String) Engine=URL('https://host:123', CSV)"
         )
         == ""
     )
@@ -72,25 +72,25 @@ def test_config_with_only_primary_hosts(start_cluster):
     )
     assert (
         node2.query(
-            "CREATE TABLE table_test_2_4 (word String) Engine=URL('https://yandex.ru:87', HDFS)"
+            "CREATE TABLE table_test_2_4 (word String) Engine=URL('https://yandex.ru:87', CSV)"
         )
         == ""
     )
     assert "not allowed" in node2.query_and_get_error(
-        "CREATE TABLE table_test_2_5 (word String) Engine=URL('https://host', HDFS)"
+        "CREATE TABLE table_test_2_5 (word String) Engine=URL('https://host', CSV)"
     )
     assert "not allowed" in node2.query_and_get_error(
         "CREATE TABLE table_test_2_5 (word String) Engine=URL('https://host:234', CSV)"
     )
     assert "not allowed" in node2.query_and_get_error(
-        "CREATE TABLE table_test_2_6 (word String) Engine=URL('https://yandex2.ru', S3)"
+        "CREATE TABLE table_test_2_6 (word String) Engine=URL('https://yandex2.ru', CSV)"
     )
 
 
 def test_config_with_only_regexp_hosts(start_cluster):
     assert (
         node3.query(
-            "CREATE TABLE table_test_3_1 (word String) Engine=URL('https://host:80', HDFS)"
+            "CREATE TABLE table_test_3_1 (word String) Engine=URL('https://host:80', CSV)"
         )
         == ""
     )
@@ -104,7 +104,7 @@ def test_config_with_only_regexp_hosts(start_cluster):
         "CREATE TABLE table_test_3_3 (word String) Engine=URL('https://host', CSV)"
     )
     assert "not allowed" in node3.query_and_get_error(
-        "CREATE TABLE table_test_3_4 (word String) Engine=URL('https://yandex2.ru', S3)"
+        "CREATE TABLE table_test_3_4 (word String) Engine=URL('https://yandex2.ru', CSV)"
     )
 
 
@@ -123,7 +123,7 @@ def test_config_without_allowed_hosts_section(start_cluster):
     )
     assert (
         node4.query(
-            "CREATE TABLE table_test_4_3 (word String) Engine=URL('https://host', HDFS)"
+            "CREATE TABLE table_test_4_3 (word String) Engine=URL('https://host', CSV)"
         )
         == ""
     )
@@ -135,7 +135,7 @@ def test_config_without_allowed_hosts_section(start_cluster):
     )
     assert (
         node4.query(
-            "CREATE TABLE table_test_4_5 (word String) Engine=URL('ftp://something.com', S3)"
+            "CREATE TABLE table_test_4_5 (word String) Engine=URL('ftp://something.com', CSV)"
         )
         == ""
     )
@@ -149,13 +149,13 @@ def test_config_without_allowed_hosts(start_cluster):
         "CREATE TABLE table_test_5_2 (word String) Engine=S3('https://host:80/bucket/key', CSV)"
     )
     assert "not allowed" in node5.query_and_get_error(
-        "CREATE TABLE table_test_5_3 (word String) Engine=URL('https://host', HDFS)"
+        "CREATE TABLE table_test_5_3 (word String) Engine=URL('https://host', CSV)"
     )
     assert "not allowed" in node5.query_and_get_error(
         "CREATE TABLE table_test_5_4 (word String) Engine=URL('https://yandex.ru', CSV)"
     )
     assert "not allowed" in node5.query_and_get_error(
-        "CREATE TABLE table_test_5_5 (word String) Engine=URL('ftp://something.com', S3)"
+        "CREATE TABLE table_test_5_5 (word String) Engine=URL('ftp://something.com', CSV)"
     )
 
 
diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
index b7ef3ce3ef2..38553f27ac1 100644
--- a/tests/integration/test_merge_tree_s3/test.py
+++ b/tests/integration/test_merge_tree_s3/test.py
@@ -214,8 +214,9 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
     # Wait for merges and old parts deletion
     for attempt in range(0, 10):
         parts_count = node.query(
-            "SELECT COUNT(*) FROM system.parts WHERE table = 's3_test' FORMAT Values"
+            "SELECT COUNT(*) FROM system.parts WHERE table = 's3_test' and active = 1 FORMAT Values"
         )
+
         if parts_count == "(1)":
             break
 
@@ -228,7 +229,9 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
     assert (
         node.query("SELECT count(distinct(id)) FROM s3_test FORMAT Values") == "(8192)"
     )
-    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD)
+    wait_for_delete_s3_objects(
+        cluster, FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD, timeout=45
+    )
 
 
 @pytest.mark.parametrize("node_name", ["node"])
diff --git a/tests/integration/test_merge_tree_s3_restore/test.py b/tests/integration/test_merge_tree_s3_restore/test.py
index 6ae63db52ef..e6ca4a78c25 100644
--- a/tests/integration/test_merge_tree_s3_restore/test.py
+++ b/tests/integration/test_merge_tree_s3_restore/test.py
@@ -88,6 +88,8 @@ def generate_values(date_str, count, sign=1):
 def create_table(
     node, table_name, attach=False, replicated=False, db_atomic=False, uuid=""
 ):
+    node.query("DROP DATABASE IF EXISTS s3")
+
     node.query(
         "CREATE DATABASE IF NOT EXISTS s3 ENGINE = {engine}".format(
             engine="Atomic" if db_atomic else "Ordinary"
@@ -501,8 +503,8 @@ def test_restore_mutations(cluster, db_atomic):
     ) == "({})".format(4096)
 
 
-@pytest.mark.parametrize("db_atomic", [False, True])
-def test_migrate_to_restorable_schema(cluster, db_atomic):
+def test_migrate_to_restorable_schema(cluster):
+    db_atomic = True
     node = cluster.instances["node_not_restorable"]
 
     create_table(node, "test", db_atomic=db_atomic)
diff --git a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
index 1e34a924e39..7d65bed3901 100644
--- a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
+++ b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/test.py
@@ -4,6 +4,7 @@ import time
 
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry
 
 from pyhdfs import HdfsClient
 
@@ -77,7 +78,7 @@ def test_hdfs_zero_copy_replication_insert(cluster):
         )
 
         node1.query("INSERT INTO hdfs_test VALUES (now() - INTERVAL 3 DAY, 10)")
-        node2.query("SYSTEM SYNC REPLICA hdfs_test")
+        node2.query("SYSTEM SYNC REPLICA hdfs_test", timeout=30)
         assert node1.query("SELECT count() FROM hdfs_test FORMAT Values") == "(1)"
         assert node2.query("SELECT count() FROM hdfs_test FORMAT Values") == "(1)"
         assert (
@@ -192,7 +193,7 @@ def test_hdfs_zero_copy_replication_move(cluster, storage_policy, init_objects):
         node1.query(
             "INSERT INTO move_test VALUES (now() - INTERVAL 3 DAY, 10), (now() - INTERVAL 1 DAY, 11)"
         )
-        node2.query("SYSTEM SYNC REPLICA move_test")
+        node2.query("SYSTEM SYNC REPLICA move_test", timeout=30)
 
         assert (
             node1.query("SELECT id FROM move_test ORDER BY dt FORMAT Values")
@@ -262,10 +263,10 @@ def test_hdfs_zero_copy_with_ttl_move(cluster, storage_policy):
         node1.query("INSERT INTO ttl_move_test VALUES (now() - INTERVAL 1 DAY, 11)")
 
         node1.query("OPTIMIZE TABLE ttl_move_test FINAL")
-        node2.query("SYSTEM SYNC REPLICA ttl_move_test")
+        node2.query("SYSTEM SYNC REPLICA ttl_move_test", timeout=30)
 
-        assert node1.query("SELECT count() FROM ttl_move_test FORMAT Values") == "(2)"
-        assert node2.query("SELECT count() FROM ttl_move_test FORMAT Values") == "(2)"
+        assert_eq_with_retry(node1, "SELECT count() FROM ttl_move_test", "2")
+        assert_eq_with_retry(node2, "SELECT count() FROM ttl_move_test", "2")
         assert (
             node1.query("SELECT id FROM ttl_move_test ORDER BY id FORMAT Values")
             == "(10),(11)"
@@ -297,10 +298,11 @@ def test_hdfs_zero_copy_with_ttl_delete(cluster):
         node1.query("INSERT INTO ttl_delete_test VALUES (now() - INTERVAL 1 DAY, 11)")
 
         node1.query("OPTIMIZE TABLE ttl_delete_test FINAL")
-        node2.query("SYSTEM SYNC REPLICA ttl_delete_test")
+        node2.query("SYSTEM SYNC REPLICA ttl_delete_test", timeout=30)
+
+        assert_eq_with_retry(node1, "SELECT count() FROM ttl_delete_test", "1")
+        assert_eq_with_retry(node2, "SELECT count() FROM ttl_delete_test", "1")
 
-        assert node1.query("SELECT count() FROM ttl_delete_test FORMAT Values") == "(1)"
-        assert node2.query("SELECT count() FROM ttl_delete_test FORMAT Values") == "(1)"
         assert (
             node1.query("SELECT id FROM ttl_delete_test ORDER BY id FORMAT Values")
             == "(11)"
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/__init__.py b/tests/integration/test_replicated_merge_tree_s3_restore/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml
new file mode 100644
index 00000000000..31f7e06db3c
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/clusters.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <remote_servers>
+        <node_zero_copy>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1z</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2z</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node_zero_copy>
+        <node_no_zero_copy>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1n</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2n</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node_no_zero_copy>
+        <node_another_bucket>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_another_bucket</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node_another_bucket>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf.xml
new file mode 100644
index 00000000000..63fe7ac1769
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf.xml
@@ -0,0 +1,35 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <send_metadata>true</send_metadata>
+                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
+            </s3>
+            <hdd>
+                <type>local</type>
+                <path>/</path>
+            </hdd>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                    <external>
+                        <disk>hdd</disk>
+                    </external>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <allow_remote_fs_zero_copy_replication>1</allow_remote_fs_zero_copy_replication>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
new file mode 100644
index 00000000000..920db2c9edd
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root2/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <send_metadata>true</send_metadata>
+                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
+            </s3>
+            <hdd>
+                <type>local</type>
+                <path>/</path>
+            </hdd>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                    <external>
+                        <disk>hdd</disk>
+                    </external>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_without_zero_copy.xml b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_without_zero_copy.xml
new file mode 100644
index 00000000000..9194d779d16
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_restore/configs/config.d/storage_conf_without_zero_copy.xml
@@ -0,0 +1,35 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <send_metadata>true</send_metadata>
+                <list_object_keys_size>1</list_object_keys_size> <!-- To effectively test restore parallelism -->
+            </s3>
+            <hdd>
+                <type>local</type>
+                <path>/</path>
+            </hdd>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                    <external>
+                        <disk>hdd</disk>
+                    </external>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <allow_remote_fs_zero_copy_replication>0</allow_remote_fs_zero_copy_replication>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/test.py b/tests/integration/test_replicated_merge_tree_s3_restore/test.py
new file mode 100644
index 00000000000..904bcfa4280
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_s3_restore/test.py
@@ -0,0 +1,258 @@
+import os
+import logging
+import random
+import string
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster, get_instances_dir
+
+
+COMMON_CONFIGS = ["configs/config.d/clusters.xml"]
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+
+        cluster.add_instance(
+            "node1z",
+            main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
+            macros={"cluster": "node_zero_copy", "replica": "0"},
+            with_minio=True,
+            with_zookeeper=True,
+            stay_alive=True,
+        )
+        cluster.add_instance(
+            "node2z",
+            main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
+            macros={"cluster": "node_zero_copy", "replica": "1"},
+            with_zookeeper=True,
+            stay_alive=True,
+        )
+        cluster.add_instance(
+            "node1n",
+            main_configs=COMMON_CONFIGS
+            + ["configs/config.d/storage_conf_without_zero_copy.xml"],
+            macros={"cluster": "node_no_zero_copy", "replica": "2"},
+            with_minio=True,
+            with_zookeeper=True,
+            stay_alive=True,
+        )
+        cluster.add_instance(
+            "node2n",
+            main_configs=COMMON_CONFIGS
+            + ["configs/config.d/storage_conf_without_zero_copy.xml"],
+            macros={"cluster": "node_no_zero_copy", "replica": "3"},
+            with_zookeeper=True,
+            stay_alive=True,
+        )
+        cluster.add_instance(
+            "node_another_bucket",
+            main_configs=COMMON_CONFIGS
+            + ["configs/config.d/storage_conf_another_bucket.xml"],
+            macros={"cluster": "node_another_bucket", "replica": "0"},
+            with_zookeeper=True,
+            stay_alive=True,
+        )
+
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def random_string(length):
+    letters = string.ascii_letters
+    return "".join(random.choice(letters) for i in range(length))
+
+
+def create_table(node, table_name, schema, attach=False, db_atomic=False, uuid=""):
+    node.query(
+        "CREATE DATABASE IF NOT EXISTS s3 {on_cluster} ENGINE = {engine}".format(
+            engine="Atomic" if db_atomic else "Ordinary",
+            on_cluster="ON CLUSTER '{cluster}'",
+        )
+    )
+
+    create_table_statement = """
+        {create} TABLE s3.{table_name} {uuid} {on_cluster} (
+            key UInt32,
+            {schema}
+        ) ENGINE={engine}
+        PARTITION BY key
+        ORDER BY key
+        SETTINGS
+            storage_policy='s3',
+            old_parts_lifetime=600,
+            index_granularity=512
+        """.format(
+        create="ATTACH" if attach else "CREATE",
+        table_name=table_name,
+        uuid="UUID '{uuid}'".format(uuid=uuid) if db_atomic and uuid else "",
+        on_cluster="ON CLUSTER '{cluster}'",
+        schema=schema,
+        engine="ReplicatedMergeTree('/clickhouse/tables/{cluster}/test', '{replica}')",
+    )
+
+    node.query(create_table_statement)
+
+
+def purge_s3(cluster, bucket):
+    minio = cluster.minio_client
+    for obj in list(minio.list_objects(bucket, recursive=True)):
+        if str(obj.object_name).find(".SCHEMA_VERSION") != -1:
+            continue
+        minio.remove_object(bucket, obj.object_name)
+
+
+def drop_s3_metadata(node):
+    node.exec_in_container(
+        ["bash", "-c", "rm -rf /var/lib/clickhouse/disks/s3/*"], user="root"
+    )
+
+
+def drop_shadow_information(node):
+    node.exec_in_container(
+        ["bash", "-c", "rm -rf /var/lib/clickhouse/shadow/*"], user="root"
+    )
+
+
+def create_restore_file(node, revision=None, bucket=None, path=None, detached=None):
+    node.exec_in_container(
+        ["bash", "-c", "mkdir -p /var/lib/clickhouse/disks/s3/"], user="root"
+    )
+    node.exec_in_container(
+        ["bash", "-c", "touch /var/lib/clickhouse/disks/s3/restore"], user="root"
+    )
+
+    add_restore_option = 'echo -en "{}={}\n" >> /var/lib/clickhouse/disks/s3/restore'
+    if revision:
+        node.exec_in_container(
+            ["bash", "-c", add_restore_option.format("revision", revision)], user="root"
+        )
+    if bucket:
+        node.exec_in_container(
+            ["bash", "-c", add_restore_option.format("source_bucket", bucket)],
+            user="root",
+        )
+    if path:
+        node.exec_in_container(
+            ["bash", "-c", add_restore_option.format("source_path", path)], user="root"
+        )
+    if detached:
+        node.exec_in_container(
+            ["bash", "-c", add_restore_option.format("detached", "true")], user="root"
+        )
+
+
+def get_revision_counter(node, backup_number):
+    return int(
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                "cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt".format(
+                    backup_number
+                ),
+            ],
+            user="root",
+        )
+    )
+
+
+def get_table_uuid(node, db_atomic, table):
+    uuid = ""
+    if db_atomic:
+        uuid = node.query(
+            "SELECT uuid FROM system.tables WHERE database='s3' AND table='{}' FORMAT TabSeparated".format(
+                table
+            )
+        ).strip()
+    return uuid
+
+
+@pytest.fixture(autouse=True)
+def drop_table(cluster):
+    yield
+
+    node_names = ["node1z", "node2z", "node1n", "node2n", "node_another_bucket"]
+
+    for node_name in node_names:
+        node = cluster.instances[node_name]
+        node.query("DROP TABLE IF EXISTS s3.test SYNC")
+        node.query("DROP DATABASE IF EXISTS s3 SYNC")
+
+        drop_s3_metadata(node)
+        drop_shadow_information(node)
+
+    buckets = [cluster.minio_bucket, cluster.minio_bucket_2]
+    for bucket in buckets:
+        purge_s3(cluster, bucket)
+
+
+@pytest.mark.parametrize("db_atomic", [False, True])
+@pytest.mark.parametrize("zero_copy", [False, True])
+def test_restore_another_bucket_path(cluster, db_atomic, zero_copy):
+    suffix = "z" if zero_copy else "n"
+    nodes = [cluster.instances[f"node1{suffix}"], cluster.instances[f"node2{suffix}"]]
+
+    keys = 100
+    data_columns = 10
+    size = 1
+
+    columns = []
+    for c in range(0, data_columns):
+        columns.append("data{c} String".format(c=c))
+    schema = ", ".join(columns)
+
+    create_table(nodes[0], "test", schema, db_atomic=db_atomic)
+    uuid = get_table_uuid(nodes[0], db_atomic, "test")
+
+    dropped_keys = 0
+
+    for key in range(0, keys):
+        node = nodes[key % 2]
+        node.query(
+            "INSERT INTO s3.test SELECT {key}, * FROM generateRandom('{schema}') LIMIT {size}".format(
+                key=key, schema=schema, size=size
+            )
+        )
+        if not (key % 3):
+            dropped_keys += 1
+            node.query("ALTER TABLE s3.test DROP PARTITION '{key}'".format(key=key))
+
+    for key in range(0, keys):
+        if not ((key + 1) % 3):
+            dropped_keys += 1
+            node.query("ALTER TABLE s3.test DROP PARTITION '{key}'".format(key=key))
+
+    nodes[0].query("SYSTEM SYNC REPLICA s3.test")
+    nodes[1].query("SYSTEM SYNC REPLICA s3.test")
+
+    # To ensure parts have merged
+    nodes[0].query("OPTIMIZE TABLE s3.test")
+    nodes[1].query("OPTIMIZE TABLE s3.test")
+
+    assert nodes[0].query(
+        "SELECT count(*) FROM s3.test FORMAT Values"
+    ) == "({})".format(size * (keys - dropped_keys))
+    assert nodes[1].query(
+        "SELECT count(*) FROM s3.test FORMAT Values"
+    ) == "({})".format(size * (keys - dropped_keys))
+
+    node_another_bucket = cluster.instances["node_another_bucket"]
+
+    create_restore_file(node_another_bucket, bucket="root")
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    create_table(
+        node_another_bucket, "test", schema, attach=True, db_atomic=db_atomic, uuid=uuid
+    )
+
+    assert node_another_bucket.query(
+        "SELECT count(*) FROM s3.test FORMAT Values"
+    ) == "({})".format(size * (keys - dropped_keys))
diff --git a/tests/integration/test_row_policy/test.py b/tests/integration/test_row_policy/test.py
index 5a2f80c5e28..2e696be4988 100644
--- a/tests/integration/test_row_policy/test.py
+++ b/tests/integration/test_row_policy/test.py
@@ -87,6 +87,11 @@ def reset_policies():
         copy_policy_xml("normal_filters.xml")
         for current_node in nodes:
             current_node.query("DROP POLICY IF EXISTS pA, pB ON mydb.filtered_table1")
+            current_node.query("DROP POLICY IF EXISTS pC ON mydb.other_table")
+            current_node.query("DROP POLICY IF EXISTS all_data ON dist_tbl, local_tbl")
+            current_node.query(
+                "DROP POLICY IF EXISTS role1_data ON dist_tbl, local_tbl"
+            )
 
 
 def test_smoke():
diff --git a/tests/jepsen.clickhouse-keeper/project.clj b/tests/jepsen.clickhouse-keeper/project.clj
index a168ef6920d..187e91cd44d 100644
--- a/tests/jepsen.clickhouse-keeper/project.clj
+++ b/tests/jepsen.clickhouse-keeper/project.clj
@@ -7,7 +7,7 @@
   :main jepsen.clickhouse-keeper.main
   :plugins [[lein-cljfmt "0.7.0"]]
   :dependencies [[org.clojure/clojure "1.10.1"]
-                 [jepsen "0.2.3"]
+                 [jepsen "0.2.6"]
                  [zookeeper-clj "0.9.4"]
                  [org.apache.zookeeper/zookeeper "3.6.1" :exclusions [org.slf4j/slf4j-log4j12]]]
   :repl-options {:init-ns jepsen.clickhouse-keeper.main})
diff --git a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
index 8c574718d88..2ab747fbd71 100644
--- a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
+++ b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
@@ -5,6 +5,7 @@
         <level>trace</level>
         <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
         <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+        <size>never</size>
     </logger>
 
     <keeper_server>
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
index 745d88e97f7..c354e36e430 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
@@ -10,10 +10,27 @@
             [jepsen.control.util :as cu]
             [jepsen.os.ubuntu :as ubuntu]))
 
-(defn get-clickhouse-sky
-  [version]
-  (c/exec :sky :get :-d common-prefix :-N :Backbone version)
-  (str common-prefix "/clickhouse"))
+
+(ns jepsen.control.scp)
+
+;; We need to overwrite Jepsen's implementation of scp! because it
+;; doesn't use strict-host-key-checking
+
+(defn scp!
+  "Runs an SCP command by shelling out. Takes a conn-spec (used for port, key,
+  etc), a seq of sources, and a single destination, all as strings."
+  [conn-spec sources dest]
+  (apply util/sh "scp" "-rpC"
+         "-P" (str (:port conn-spec))
+         (concat (when-let [k (:private-key-path conn-spec)]
+                   ["-i" k])
+                 (if-not (:strict-host-key-checking conn-spec)
+                   ["-o StrictHostKeyChecking=no"])
+                 sources
+                 [dest]))
+  nil)
+
+(ns jepsen.clickhouse-keeper.db)
 
 (defn get-clickhouse-url
   [url]
@@ -27,7 +44,6 @@
   [source]
   (info "Downloading clickhouse from" source)
   (cond
-    (clojure.string/starts-with? source "rbtorrent:") (get-clickhouse-sky source)
     (clojure.string/starts-with? source "http") (get-clickhouse-url source)
     (.exists (io/file source)) (get-clickhouse-scp source)
     :else (throw (Exception. (str "Don't know how to download clickhouse from" source)))))
@@ -141,8 +157,13 @@
          (do
            (info node "Coordination files exists, going to compress")
            (c/cd data-dir
-                 (c/exec :tar :czf "coordination.tar.gz" "coordination")))))
-      (let [common-logs [stderr-file (str logs-dir "/clickhouse-keeper.log") (str data-dir "/coordination.tar.gz")]
+                 (c/exec :tar :czf "coordination.tar.gz" "coordination"))))
+       (if (cu/exists? (str logs-dir))
+         (do
+           (info node "Logs exist, going to compress")
+           (c/cd common-prefix
+                 (c/exec :tar :czf "logs.tar.gz" "logs"))) (info node "Logs are missing")))
+      (let [common-logs [(str common-prefix "/logs.tar.gz") (str data-dir "/coordination.tar.gz")]
             gdb-log (str logs-dir "/gdb.log")]
         (if (cu/exists? (str logs-dir "/gdb.log"))
           (conj common-logs gdb-log)
diff --git a/tests/performance/conditional.xml b/tests/performance/conditional.xml
index 91b6cb95ff2..e1d15852767 100644
--- a/tests/performance/conditional.xml
+++ b/tests/performance/conditional.xml
@@ -8,4 +8,7 @@
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(multiIf(rand() % 2, toDateTime(rand()), toDate(rand())))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(if(rand() % 2, [toDateTime(rand())], [toDate(rand())]))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(multiIf(rand() % 2, [toDateTime(rand())], [toDate(rand())]))</query>
+
+    <query>SELECT count() FROM numbers(50000000) WHERE NOT ignore(COALESCE(toNullable(number), 0))</query>
+    <query>SELECT count() FROM numbers(10000000) WHERE NOT ignore(multiIf(number % 7 = 0, 1, number % 3 = 0, 2, number % 5 = 0, 3, number % 11 = 0, 4, 5))</query>
 </test>
diff --git a/tests/performance/great_circle_dist.xml b/tests/performance/great_circle_dist.xml
index ad445f34417..62666e2d934 100644
--- a/tests/performance/great_circle_dist.xml
+++ b/tests/performance/great_circle_dist.xml
@@ -1,7 +1,18 @@
 <test>
+    <substitutions>
+        <substitution>
+            <name>func</name>
+            <values>
+                <value>greatCircleDistance</value>
+                <value>greatCircleAngle</value>
+                <value>geoDistance</value>
+           </values>
+        </substitution>
+    </substitutions>
+
     <!-- lon [-180; 180], lat [-90; 90] -->
-    <query>SELECT count() FROM numbers(1000000) WHERE NOT ignore(greatCircleDistance((rand(1) % 360) * 1. - 180, (number % 150) * 1.2 - 90, (number % 360) + toFloat64(rand(2)) / 4294967296 - 180, (rand(3) % 180) * 1. - 90))</query>
+    <query>SELECT count() FROM numbers(10000000) WHERE NOT ignore({func}((rand(1) % 360) * 1. - 180, (number % 150) * 1.2 - 90, (number % 360) + toFloat64(rand(2)) / 4294967296 - 180, (rand(3) % 180) * 1. - 90))</query>
     <!-- 55.755830, 37.617780 is center of Moscow -->
-    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(greatCircleDistance(55. + toFloat64(rand(1)) / 4294967296, 37. + toFloat64(rand(2)) / 4294967296, 55. + toFloat64(rand(3)) / 4294967296, 37. + toFloat64(rand(4)) / 4294967296))</query>
+    <query>SELECT count() FROM zeros(100000000) WHERE NOT ignore({func}(55. + toFloat64(rand(1)) / 4294967296, 37. + toFloat64(rand(2)) / 4294967296, 55. + toFloat64(rand(3)) / 4294967296, 37. + toFloat64(rand(4)) / 4294967296))</query>
 </test>
 
diff --git a/tests/performance/hierarchical_dictionaries.xml b/tests/performance/hierarchical_dictionaries.xml
new file mode 100644
index 00000000000..e6030886a1c
--- /dev/null
+++ b/tests/performance/hierarchical_dictionaries.xml
@@ -0,0 +1,55 @@
+<test>
+    <substitutions>
+        <substitution>
+            <name>dictionary_layout</name>
+            <values>
+                <value>flat</value>
+                <value>hashed</value>
+                <value>hashed_array</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>func</name>
+            <values>
+                <value>dictGetHierarchy</value>
+                <value>dictGetDescendants</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <create_query>
+        CREATE TABLE hierarchical_dictionary_source_table
+        (
+            id UInt64,
+            parent_id UInt64
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY hierarchical_{dictionary_layout}_dictionary
+        (
+            id UInt64,
+            parent_id UInt64 HIERARCHICAL
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'hierarchical_dictionary_source_table'))
+        LAYOUT({dictionary_layout}())
+        LIFETIME(0);
+    </create_query>
+
+    <fill_query>
+        INSERT INTO hierarchical_dictionary_source_table
+        SELECT number, rand64() % 250000
+        FROM system.numbers
+        LIMIT 500000;
+    </fill_query>
+
+    <query>
+        SELECT {func}('hierarchical_{dictionary_layout}_dictionary', id) FROM hierarchical_{dictionary_layout}_dictionary FORMAT Null;
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS hierarchical_dictionary_source_table;</drop_query>
+    <drop_query>DROP DICTIONARY IF EXISTS hierarchical_{dictionary_layout}_dictionary;</drop_query>
+
+</test>
diff --git a/tests/performance/norm_distance.xml b/tests/performance/norm_distance.xml
index b6a7f9724c2..3dc8cbd70e6 100644
--- a/tests/performance/norm_distance.xml
+++ b/tests/performance/norm_distance.xml
@@ -90,9 +90,9 @@
     <query>WITH (SELECT t FROM tuples_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT cosineDistance(a, t) AS dist FROM tuples_{element_type})</query>
 
     <!-- Arrays -->
-    <query>SELECT sum(dist) FROM (SELECT array{norm}Norm(v) AS dist FROM vecs_{element_type})</query>
-    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT array{norm}Distance(a, v) AS dist FROM vecs_{element_type})</query>
-    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT arrayCosineDistance(a, v) AS dist FROM vecs_{element_type})</query>
+    <query>SELECT sum(dist) FROM (SELECT {norm}Norm(v) AS dist FROM vecs_{element_type})</query>
+    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT {norm}Distance(a, v) AS dist FROM vecs_{element_type})</query>
+    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT cosineDistance(a, v) AS dist FROM vecs_{element_type})</query>
 
     <drop_query>DROP TABLE vecs_{element_type}</drop_query>
     <drop_query>DROP TABLE tuples_{element_type}</drop_query>
diff --git a/tests/performance/sparse_column.xml b/tests/performance/sparse_column.xml
index 1d270165c68..b851967ee82 100644
--- a/tests/performance/sparse_column.xml
+++ b/tests/performance/sparse_column.xml
@@ -53,6 +53,8 @@
 
     <query>SELECT sum(u64) FROM test_{serialization}_{ratio} GROUP BY id % 11 FORMAT Null</query>
     <query>SELECT uniq(str) FROM test_{serialization}_{ratio} GROUP BY id % 11 FORMAT Null</query>
+    <query>SELECT sum(u64) FROM test_{serialization}_{ratio} FORMAT Null</query>
+    <query>SELECT uniq(str) FROM test_{serialization}_{ratio} FORMAT Null</query>
 
     <query>SELECT count() FROM test_{serialization}_{ratio} WHERE u64 > 0</query>
     <query>SELECT count() FROM test_{serialization}_{ratio} WHERE notEmpty(str)</query>
diff --git a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.reference b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.reference
index 2176028b1c0..788c54e3b42 100644
--- a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.reference
+++ b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.reference
@@ -1,5 +1,5 @@
-2014-01-02	0	0	1970-01-01 03:00:00	2014-01-02 03:04:06
-1	2014-01-02 07:04:06
+2014-01-02	0	0	1969-12-31 16:00:00	2014-01-02 03:04:06
+1	2014-01-01 19:04:06
 0
 0
 0
diff --git a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
index 2fd097b9538..b05b49ba33a 100644
--- a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
+++ b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
@@ -8,8 +8,8 @@ DROP TABLE IF EXISTS test_table;
 DROP TABLE IF EXISTS test_view;
 DROP TABLE IF EXISTS test_view_filtered;
 
-CREATE TABLE test_table (EventDate Date, CounterID UInt32,  UserID UInt64,  EventTime DateTime('Europe/Moscow'), UTCEventTime DateTime('UTC')) ENGINE = MergeTree(EventDate, CounterID, 8192);
-CREATE MATERIALIZED VIEW test_view (Rows UInt64,  MaxHitTime DateTime('Europe/Moscow')) ENGINE = Memory AS SELECT count() AS Rows, max(UTCEventTime) AS MaxHitTime FROM test_table;
+CREATE TABLE test_table (EventDate Date, CounterID UInt32,  UserID UInt64,  EventTime DateTime('America/Los_Angeles'), UTCEventTime DateTime('UTC')) ENGINE = MergeTree(EventDate, CounterID, 8192);
+CREATE MATERIALIZED VIEW test_view (Rows UInt64,  MaxHitTime DateTime('America/Los_Angeles')) ENGINE = Memory AS SELECT count() AS Rows, max(UTCEventTime) AS MaxHitTime FROM test_table;
 CREATE MATERIALIZED VIEW test_view_filtered (EventDate Date, CounterID UInt32) ENGINE = Memory POPULATE AS SELECT CounterID, EventDate FROM test_table WHERE EventDate < '2013-01-01';
 
 INSERT INTO test_table (EventDate, UTCEventTime) VALUES ('2014-01-02', '2014-01-02 03:04:06');
diff --git a/tests/queries/0_stateless/00147_alter_nested_default.reference b/tests/queries/0_stateless/00147_alter_nested_default.reference
index db1e3c7677e..130fb4897ef 100644
--- a/tests/queries/0_stateless/00147_alter_nested_default.reference
+++ b/tests/queries/0_stateless/00147_alter_nested_default.reference
@@ -17,8 +17,8 @@
 2015-01-01	['Hello','World']	[0,0]
 2015-01-01	['Hello2','World2']	[0,0]
 2015-01-01	Hello	0
-2015-01-01	World	0
 2015-01-01	Hello2	0
+2015-01-01	World	0
 2015-01-01	World2	0
 2015-01-01	Hello	0
 2015-01-01	Hello2	0
diff --git a/tests/queries/0_stateless/00147_alter_nested_default.sql b/tests/queries/0_stateless/00147_alter_nested_default.sql
index e0a180b43cf..54c99545364 100644
--- a/tests/queries/0_stateless/00147_alter_nested_default.sql
+++ b/tests/queries/0_stateless/00147_alter_nested_default.sql
@@ -22,8 +22,8 @@ SELECT * FROM alter_00147 ARRAY JOIN n WHERE n.x LIKE '%Hello%' ORDER BY n.x;
 
 OPTIMIZE TABLE alter_00147;
 
-SELECT * FROM alter_00147;
-SELECT * FROM alter_00147 ARRAY JOIN n;
-SELECT * FROM alter_00147 ARRAY JOIN n WHERE n.x LIKE '%Hello%';
+SELECT * FROM alter_00147 ORDER BY n.x;
+SELECT * FROM alter_00147 ARRAY JOIN n ORDER BY n.x;
+SELECT * FROM alter_00147 ARRAY JOIN n WHERE n.x LIKE '%Hello%' ORDER BY n.x;
 
 DROP TABLE alter_00147;
diff --git a/tests/queries/0_stateless/00189_time_zones_long.reference b/tests/queries/0_stateless/00189_time_zones_long.reference
index c55542f59a6..e53ec7ca815 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.reference
+++ b/tests/queries/0_stateless/00189_time_zones_long.reference
@@ -10,7 +10,7 @@ toStartOfDay
 2014-09-30 00:00:00
 2014-09-30 00:00:00
 toMonday
-2014-12-29
+2014-12-22
 2014-12-22
 2014-12-22
 2014-12-29
@@ -54,7 +54,7 @@ toStartOfYear
 2014-01-01
 2014-01-01
 toTime
-1970-01-02 12:00:00	1970-01-02 12:00:00
+1970-01-02 11:00:00	1970-01-02 12:00:00
 1970-01-02 10:00:00	1970-01-02 11:00:00
 1970-01-02 09:00:00	1970-01-02 10:00:00
 1970-01-02 18:00:00	1970-01-02 18:00:00
@@ -84,7 +84,7 @@ toDayOfWeek
 3
 2
 toHour
-23
+22
 21
 20
 4
@@ -236,10 +236,10 @@ toString
 2015-07-15 02:30:00
 toUnixTimestamp
 1426415400
+1426419000
 1426422600
-1426426200
-1426393800
-1426455000
+1426390200
+1426451400
 1426415400
 1426415400
 1426415400
diff --git a/tests/queries/0_stateless/00189_time_zones_long.sql b/tests/queries/0_stateless/00189_time_zones_long.sql
index 790b645e4f9..cf1b9e9ae1d 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.sql
+++ b/tests/queries/0_stateless/00189_time_zones_long.sql
@@ -1,12 +1,12 @@
 -- Tags: long
 
-/* timestamp 1419800400 == 2014-12-29 00:00:00 (Europe/Moscow) */
-/* timestamp 1412106600 == 2014-09-30 23:50:00 (Europe/Moscow) */
-/* timestamp 1420102800 == 2015-01-01 12:00:00 (Europe/Moscow) */
-/* timestamp 1428310800 == 2015-04-06 12:00:00 (Europe/Moscow) */
-/* timestamp 1436956200 == 2015-07-15 13:30:00 (Europe/Moscow) */
-/* timestamp 1426415400 == 2015-03-15 13:30:00 (Europe/Moscow) */
-/* timestamp 1549483055 == 2019-02-06 22:57:35 (Europe/Moscow) */
+/* timestamp 1419800400 == 2014-12-29 00:00:00 (Asia/Istanbul) */
+/* timestamp 1412106600 == 2014-09-30 23:50:00 (Asia/Istanbul) */
+/* timestamp 1420102800 == 2015-01-01 12:00:00 (Asia/Istanbul) */
+/* timestamp 1428310800 == 2015-04-06 12:00:00 (Asia/Istanbul) */
+/* timestamp 1436956200 == 2015-07-15 13:30:00 (Asia/Istanbul) */
+/* timestamp 1426415400 == 2015-03-15 13:30:00 (Asia/Istanbul) */
+/* timestamp 1549483055 == 2019-02-06 22:57:35 (Asia/Istanbul) */
 /* date 16343 == 2014-09-30 */
 /* date 16433 == 2014-12-29 */
 /* date 17933 == 2019-02-06 */
@@ -14,12 +14,12 @@
 /* toStartOfDay */
 
 SELECT 'toStartOfDay';
-SELECT toStartOfDay(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toStartOfDay(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toStartOfDay(toDateTime(1412106600), 'Europe/Paris');
 SELECT toStartOfDay(toDateTime(1412106600), 'Europe/London');
 SELECT toStartOfDay(toDateTime(1412106600), 'Asia/Tokyo');
 SELECT toStartOfDay(toDateTime(1412106600), 'Pacific/Pitcairn');
-SELECT toStartOfDay(toDate(16343), 'Europe/Moscow');
+SELECT toStartOfDay(toDate(16343), 'Asia/Istanbul');
 SELECT toStartOfDay(toDate(16343), 'Europe/Paris');
 SELECT toStartOfDay(toDate(16343), 'Europe/London');
 SELECT toStartOfDay(toDate(16343), 'Asia/Tokyo');
@@ -28,7 +28,7 @@ SELECT toStartOfDay(toDate(16343), 'Pacific/Pitcairn');
 /* toMonday */
 
 SELECT 'toMonday';
-SELECT toMonday(toDateTime(1419800400), 'Europe/Moscow');
+SELECT toMonday(toDateTime(1419800400), 'Asia/Istanbul');
 SELECT toMonday(toDateTime(1419800400), 'Europe/Paris');
 SELECT toMonday(toDateTime(1419800400), 'Europe/London');
 SELECT toMonday(toDateTime(1419800400), 'Asia/Tokyo');
@@ -42,7 +42,7 @@ SELECT toMonday(toDate(16433));
 /* toStartOfMonth */
 
 SELECT 'toStartOfMonth';
-SELECT toStartOfMonth(toDateTime(1419800400), 'Europe/Moscow');
+SELECT toStartOfMonth(toDateTime(1419800400), 'Asia/Istanbul');
 SELECT toStartOfMonth(toDateTime(1419800400), 'Europe/Paris');
 SELECT toStartOfMonth(toDateTime(1419800400), 'Europe/London');
 SELECT toStartOfMonth(toDateTime(1419800400), 'Asia/Tokyo');
@@ -56,7 +56,7 @@ SELECT toStartOfMonth(toDate(16433));
 /* toStartOfQuarter */
 
 SELECT 'toStartOfQuarter';
-SELECT toStartOfQuarter(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toStartOfQuarter(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toStartOfQuarter(toDateTime(1412106600), 'Europe/Paris');
 SELECT toStartOfQuarter(toDateTime(1412106600), 'Europe/London');
 SELECT toStartOfQuarter(toDateTime(1412106600), 'Asia/Tokyo');
@@ -70,7 +70,7 @@ SELECT toStartOfQuarter(toDate(16343));
 /* toStartOfYear */
 
 SELECT 'toStartOfYear';
-SELECT toStartOfYear(toDateTime(1419800400), 'Europe/Moscow');
+SELECT toStartOfYear(toDateTime(1419800400), 'Asia/Istanbul');
 SELECT toStartOfYear(toDateTime(1419800400), 'Europe/Paris');
 SELECT toStartOfYear(toDateTime(1419800400), 'Europe/London');
 SELECT toStartOfYear(toDateTime(1419800400), 'Asia/Tokyo');
@@ -84,7 +84,7 @@ SELECT toStartOfYear(toDate(16433));
 /* toTime */
 
 SELECT 'toTime';
-SELECT toString(toTime(toDateTime(1420102800), 'Europe/Moscow'), 'Europe/Moscow'), toString(toTime(toDateTime(1428310800), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toTime(toDateTime(1420102800), 'Asia/Istanbul'), 'Asia/Istanbul'), toString(toTime(toDateTime(1428310800), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toString(toTime(toDateTime(1420102800), 'Europe/Paris'), 'Europe/Paris'), toString(toTime(toDateTime(1428310800), 'Europe/Paris'), 'Europe/Paris');
 SELECT toString(toTime(toDateTime(1420102800), 'Europe/London'), 'Europe/London'), toString(toTime(toDateTime(1428310800), 'Europe/London'), 'Europe/London');
 SELECT toString(toTime(toDateTime(1420102800), 'Asia/Tokyo'), 'Asia/Tokyo'), toString(toTime(toDateTime(1428310800), 'Asia/Tokyo'), 'Asia/Tokyo');
@@ -93,7 +93,7 @@ SELECT toString(toTime(toDateTime(1420102800), 'Pacific/Pitcairn'), 'Pacific/Pit
 /* toYear */
 
 SELECT 'toYear';
-SELECT toYear(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toYear(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toYear(toDateTime(1412106600), 'Europe/Paris');
 SELECT toYear(toDateTime(1412106600), 'Europe/London');
 SELECT toYear(toDateTime(1412106600), 'Asia/Tokyo');
@@ -102,7 +102,7 @@ SELECT toYear(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toMonth */
 
 SELECT 'toMonth';
-SELECT toMonth(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toMonth(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toMonth(toDateTime(1412106600), 'Europe/Paris');
 SELECT toMonth(toDateTime(1412106600), 'Europe/London');
 SELECT toMonth(toDateTime(1412106600), 'Asia/Tokyo');
@@ -111,7 +111,7 @@ SELECT toMonth(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toDayOfMonth */
 
 SELECT 'toDayOfMonth';
-SELECT toDayOfMonth(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toDayOfMonth(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toDayOfMonth(toDateTime(1412106600), 'Europe/Paris');
 SELECT toDayOfMonth(toDateTime(1412106600), 'Europe/London');
 SELECT toDayOfMonth(toDateTime(1412106600), 'Asia/Tokyo');
@@ -120,7 +120,7 @@ SELECT toDayOfMonth(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toDayOfWeek */
 
 SELECT 'toDayOfWeek';
-SELECT toDayOfWeek(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toDayOfWeek(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toDayOfWeek(toDateTime(1412106600), 'Europe/Paris');
 SELECT toDayOfWeek(toDateTime(1412106600), 'Europe/London');
 SELECT toDayOfWeek(toDateTime(1412106600), 'Asia/Tokyo');
@@ -129,7 +129,7 @@ SELECT toDayOfWeek(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toHour */
 
 SELECT 'toHour';
-SELECT toHour(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toHour(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toHour(toDateTime(1412106600), 'Europe/Paris');
 SELECT toHour(toDateTime(1412106600), 'Europe/London');
 SELECT toHour(toDateTime(1412106600), 'Asia/Tokyo');
@@ -138,7 +138,7 @@ SELECT toHour(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toMinute */
 
 SELECT 'toMinute';
-SELECT toMinute(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toMinute(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toMinute(toDateTime(1412106600), 'Europe/Paris');
 SELECT toMinute(toDateTime(1412106600), 'Europe/London');
 SELECT toMinute(toDateTime(1412106600), 'Asia/Tokyo');
@@ -147,7 +147,7 @@ SELECT toMinute(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toSecond */
 
 SELECT 'toSecond';
-SELECT toSecond(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toSecond(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toSecond(toDateTime(1412106600), 'Europe/Paris');
 SELECT toSecond(toDateTime(1412106600), 'Europe/London');
 SELECT toSecond(toDateTime(1412106600), 'Asia/Tokyo');
@@ -156,7 +156,7 @@ SELECT toSecond(toDateTime(1412106600), 'Pacific/Pitcairn');
 /* toStartOfMinute */
 
 SELECT 'toStartOfMinute';
-SELECT toString(toStartOfMinute(toDateTime(1549483055), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toStartOfMinute(toDateTime(1549483055), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toString(toStartOfMinute(toDateTime(1549483055), 'Europe/Paris'), 'Europe/Paris');
 SELECT toString(toStartOfMinute(toDateTime(1549483055), 'Europe/London'), 'Europe/London');
 SELECT toString(toStartOfMinute(toDateTime(1549483055), 'Asia/Tokyo'), 'Asia/Tokyo');
@@ -165,7 +165,7 @@ SELECT toString(toStartOfMinute(toDateTime(1549483055), 'Pacific/Pitcairn'), 'Pa
 /* toStartOfFiveMinutes */
 
 SELECT 'toStartOfFiveMinutes';
-SELECT toString(toStartOfFiveMinutes(toDateTime(1549483055), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toStartOfFiveMinutes(toDateTime(1549483055), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toString(toStartOfFiveMinutes(toDateTime(1549483055), 'Europe/Paris'), 'Europe/Paris');
 SELECT toString(toStartOfFiveMinutes(toDateTime(1549483055), 'Europe/London'), 'Europe/London');
 SELECT toString(toStartOfFiveMinutes(toDateTime(1549483055), 'Asia/Tokyo'), 'Asia/Tokyo');
@@ -174,7 +174,7 @@ SELECT toString(toStartOfFiveMinutes(toDateTime(1549483055), 'Pacific/Pitcairn')
 /* toStartOfTenMinutes */
 
 SELECT 'toStartOfTenMinutes';
-SELECT toString(toStartOfTenMinutes(toDateTime(1549483055), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toStartOfTenMinutes(toDateTime(1549483055), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toString(toStartOfTenMinutes(toDateTime(1549483055), 'Europe/Paris'), 'Europe/Paris');
 SELECT toString(toStartOfTenMinutes(toDateTime(1549483055), 'Europe/London'), 'Europe/London');
 SELECT toString(toStartOfTenMinutes(toDateTime(1549483055), 'Asia/Tokyo'), 'Asia/Tokyo');
@@ -183,7 +183,7 @@ SELECT toString(toStartOfTenMinutes(toDateTime(1549483055), 'Pacific/Pitcairn'),
 /* toStartOfFifteenMinutes */
 
 SELECT 'toStartOfFifteenMinutes';
-SELECT toString(toStartOfFifteenMinutes(toDateTime(1549483055), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toStartOfFifteenMinutes(toDateTime(1549483055), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toString(toStartOfFifteenMinutes(toDateTime(1549483055), 'Europe/Paris'), 'Europe/Paris');
 SELECT toString(toStartOfFifteenMinutes(toDateTime(1549483055), 'Europe/London'), 'Europe/London');
 SELECT toString(toStartOfFifteenMinutes(toDateTime(1549483055), 'Asia/Tokyo'), 'Asia/Tokyo');
@@ -192,7 +192,7 @@ SELECT toString(toStartOfFifteenMinutes(toDateTime(1549483055), 'Pacific/Pitcair
 /* toStartOfHour */
 
 SELECT 'toStartOfHour';
-SELECT toString(toStartOfHour(toDateTime(1549483055), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toStartOfHour(toDateTime(1549483055), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toString(toStartOfHour(toDateTime(1549483055), 'Europe/Paris'), 'Europe/Paris');
 SELECT toString(toStartOfHour(toDateTime(1549483055), 'Europe/London'), 'Europe/London');
 SELECT toString(toStartOfHour(toDateTime(1549483055), 'Asia/Tokyo'), 'Asia/Tokyo');
@@ -201,33 +201,33 @@ SELECT toString(toStartOfHour(toDateTime(1549483055), 'Pacific/Pitcairn'), 'Paci
 /* toStartOfInterval */
 
 SELECT 'toStartOfInterval';
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 year, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 year, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 5 year, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 quarter, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 quarter, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 3 quarter, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 month, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 month, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 5 month, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 week, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 week, 'Europe/Moscow');
-SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 6 week, 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 day, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 day, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 5 day, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 hour, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 hour, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 6 hour, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 24 hour, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 minute, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 minute, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 5 minute, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 20 minute, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 90 minute, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 second, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 second, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 5 second, 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 year, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 year, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 5 year, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 quarter, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 quarter, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 3 quarter, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 month, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 month, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 5 month, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 1 week, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 2 week, 'Asia/Istanbul');
+SELECT toStartOfInterval(toDateTime(1549483055), INTERVAL 6 week, 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 day, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 day, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 5 day, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 hour, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 hour, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 6 hour, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 24 hour, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 minute, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 minute, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 5 minute, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 20 minute, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 90 minute, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 1 second, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 2 second, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDateTime(1549483055), INTERVAL 5 second, 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toStartOfInterval(toDate(17933), INTERVAL 1 year);
 SELECT toStartOfInterval(toDate(17933), INTERVAL 2 year);
 SELECT toStartOfInterval(toDate(17933), INTERVAL 5 year);
@@ -240,14 +240,14 @@ SELECT toStartOfInterval(toDate(17933), INTERVAL 5 month);
 SELECT toStartOfInterval(toDate(17933), INTERVAL 1 week);
 SELECT toStartOfInterval(toDate(17933), INTERVAL 2 week);
 SELECT toStartOfInterval(toDate(17933), INTERVAL 6 week);
-SELECT toString(toStartOfInterval(toDate(17933), INTERVAL 1 day, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDate(17933), INTERVAL 2 day, 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toString(toStartOfInterval(toDate(17933), INTERVAL 5 day, 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toString(toStartOfInterval(toDate(17933), INTERVAL 1 day, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDate(17933), INTERVAL 2 day, 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toString(toStartOfInterval(toDate(17933), INTERVAL 5 day, 'Asia/Istanbul'), 'Asia/Istanbul');
 
 /* toRelativeYearNum */
 
 SELECT 'toRelativeYearNum';
-SELECT toRelativeYearNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeYearNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeYearNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeYearNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeYearNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeYearNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeYearNum(toDateTime(1412106600), 'Europe/London') - toRelativeYearNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeYearNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeYearNum(toDateTime(0), 'Asia/Tokyo');
@@ -256,7 +256,7 @@ SELECT toRelativeYearNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativ
 /* toRelativeMonthNum */
 
 SELECT 'toRelativeMonthNum';
-SELECT toRelativeMonthNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeMonthNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeMonthNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeMonthNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeMonthNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeMonthNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeMonthNum(toDateTime(1412106600), 'Europe/London') - toRelativeMonthNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeMonthNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeMonthNum(toDateTime(0), 'Asia/Tokyo');
@@ -265,7 +265,7 @@ SELECT toRelativeMonthNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelati
 /* toRelativeWeekNum */
 
 SELECT 'toRelativeWeekNum';
-SELECT toRelativeWeekNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeWeekNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeWeekNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeWeekNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeWeekNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeWeekNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeWeekNum(toDateTime(1412106600), 'Europe/London') - toRelativeWeekNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeWeekNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeWeekNum(toDateTime(0), 'Asia/Tokyo');
@@ -274,7 +274,7 @@ SELECT toRelativeWeekNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativ
 /* toRelativeDayNum */
 
 SELECT 'toRelativeDayNum';
-SELECT toRelativeDayNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeDayNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeDayNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeDayNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeDayNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeDayNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeDayNum(toDateTime(1412106600), 'Europe/London') - toRelativeDayNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeDayNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeDayNum(toDateTime(0), 'Asia/Tokyo');
@@ -284,7 +284,7 @@ SELECT toUInt16(toRelativeDayNum(toDateTime(1412106600), 'Pacific/Pitcairn') - t
 /* toRelativeHourNum */
 
 SELECT 'toRelativeHourNum';
-SELECT toRelativeHourNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeHourNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeHourNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeHourNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeHourNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeHourNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeHourNum(toDateTime(1412106600), 'Europe/London') - toRelativeHourNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeHourNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeHourNum(toDateTime(0), 'Asia/Tokyo');
@@ -293,7 +293,7 @@ SELECT toRelativeHourNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelativ
 /* toRelativeMinuteNum */
 
 SELECT 'toRelativeMinuteNum';
-SELECT toRelativeMinuteNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeMinuteNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeMinuteNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeMinuteNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeMinuteNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeMinuteNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeMinuteNum(toDateTime(1412106600), 'Europe/London') - toRelativeMinuteNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeMinuteNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeMinuteNum(toDateTime(0), 'Asia/Tokyo');
@@ -302,7 +302,7 @@ SELECT toRelativeMinuteNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelat
 /* toRelativeSecondNum */
 
 SELECT 'toRelativeSecondNum';
-SELECT toRelativeSecondNum(toDateTime(1412106600), 'Europe/Moscow') - toRelativeSecondNum(toDateTime(0), 'Europe/Moscow');
+SELECT toRelativeSecondNum(toDateTime(1412106600), 'Asia/Istanbul') - toRelativeSecondNum(toDateTime(0), 'Asia/Istanbul');
 SELECT toRelativeSecondNum(toDateTime(1412106600), 'Europe/Paris') - toRelativeSecondNum(toDateTime(0), 'Europe/Paris');
 SELECT toRelativeSecondNum(toDateTime(1412106600), 'Europe/London') - toRelativeSecondNum(toDateTime(0), 'Europe/London');
 SELECT toRelativeSecondNum(toDateTime(1412106600), 'Asia/Tokyo') - toRelativeSecondNum(toDateTime(0), 'Asia/Tokyo');
@@ -311,13 +311,13 @@ SELECT toRelativeSecondNum(toDateTime(1412106600), 'Pacific/Pitcairn') - toRelat
 /* toDate */
 
 SELECT 'toDate';
-SELECT toDate(toDateTime(1412106600), 'Europe/Moscow');
+SELECT toDate(toDateTime(1412106600), 'Asia/Istanbul');
 SELECT toDate(toDateTime(1412106600), 'Europe/Paris');
 SELECT toDate(toDateTime(1412106600), 'Europe/London');
 SELECT toDate(toDateTime(1412106600), 'Asia/Tokyo');
 SELECT toDate(toDateTime(1412106600), 'Pacific/Pitcairn');
 
-SELECT toDate(1412106600, 'Europe/Moscow');
+SELECT toDate(1412106600, 'Asia/Istanbul');
 SELECT toDate(1412106600, 'Europe/Paris');
 SELECT toDate(1412106600, 'Europe/London');
 SELECT toDate(1412106600, 'Asia/Tokyo');
@@ -328,7 +328,7 @@ SELECT toDate(16343);
 /* toString */
 
 SELECT 'toString';
-SELECT toString(toDateTime(1436956200), 'Europe/Moscow');
+SELECT toString(toDateTime(1436956200), 'Asia/Istanbul');
 SELECT toString(toDateTime(1436956200), 'Europe/Paris');
 SELECT toString(toDateTime(1436956200), 'Europe/London');
 SELECT toString(toDateTime(1436956200), 'Asia/Tokyo');
@@ -337,13 +337,13 @@ SELECT toString(toDateTime(1436956200), 'Pacific/Pitcairn');
 /* toUnixTimestamp */
 
 SELECT 'toUnixTimestamp';
-SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Moscow'), 'Europe/Moscow');
-SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Moscow'), 'Europe/Paris');
-SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Moscow'), 'Europe/London');
-SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Moscow'), 'Asia/Tokyo');
-SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Moscow'), 'Pacific/Pitcairn');
+SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Istanbul'), 'Asia/Istanbul');
+SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Istanbul'), 'Europe/Paris');
+SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Istanbul'), 'Europe/London');
+SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Istanbul'), 'Asia/Tokyo');
+SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Istanbul'), 'Pacific/Pitcairn');
 
-SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Istanbul'), 'Asia/Istanbul');
 SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/Paris'), 'Europe/Paris');
 SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Europe/London'), 'Europe/London');
 SELECT toUnixTimestamp(toString(toDateTime(1426415400), 'Asia/Tokyo'), 'Asia/Tokyo');
diff --git a/tests/queries/0_stateless/00206_empty_array_to_single.reference b/tests/queries/0_stateless/00206_empty_array_to_single.reference
index 1f616bf2f86..248affbb606 100644
--- a/tests/queries/0_stateless/00206_empty_array_to_single.reference
+++ b/tests/queries/0_stateless/00206_empty_array_to_single.reference
@@ -1,7 +1,7 @@
 [1,2]
 [0]
 [4,5,6]
-['']	['1970-01-01']	['1970-01-01 03:00:00']
+['']	['1970-01-01']	['1970-01-01 02:00:00']
 [0]	['']	['1970-01-01 00:00:00']	['1970-01-01']
 [0]	['0']	['2015-01-01 00:00:00']	['2015-01-01']
 [0,1]	['']	['2015-01-01 00:00:00','2015-01-01 00:00:01']	['2015-01-01','2015-01-02']
diff --git a/tests/queries/0_stateless/00206_empty_array_to_single.sql b/tests/queries/0_stateless/00206_empty_array_to_single.sql
index 0e3ff4f3537..85e8f82436d 100644
--- a/tests/queries/0_stateless/00206_empty_array_to_single.sql
+++ b/tests/queries/0_stateless/00206_empty_array_to_single.sql
@@ -1,5 +1,5 @@
 SELECT emptyArrayToSingle(arrayFilter(x -> x != 99, arrayJoin([[1, 2], [99], [4, 5, 6]])));
-SELECT emptyArrayToSingle(emptyArrayString()), emptyArrayToSingle(emptyArrayDate()), emptyArrayToSingle(arrayFilter(x -> 0, [now('Europe/Moscow')]));
+SELECT emptyArrayToSingle(emptyArrayString()), emptyArrayToSingle(emptyArrayDate()), emptyArrayToSingle(arrayFilter(x -> 0, [now('Asia/Istanbul')]));
 
 SELECT
     emptyArrayToSingle(range(number % 3)),
diff --git a/tests/queries/0_stateless/00301_csv.reference b/tests/queries/0_stateless/00301_csv.reference
index a9351f91f70..9863da4b640 100644
--- a/tests/queries/0_stateless/00301_csv.reference
+++ b/tests/queries/0_stateless/00301_csv.reference
@@ -7,7 +7,7 @@ default-eof	1	2019-06-19
 2016-01-01 01:02:03	1
 2016-01-02 01:02:03	2
 2017-08-15 13:15:01	3
-1970-01-02 06:46:39	4
+1970-01-02 05:46:39	4
 2016-01-01 01:02:03	NUL
 2016-01-02 01:02:03	Nhello
 \N	\N
diff --git a/tests/queries/0_stateless/00301_csv.sh b/tests/queries/0_stateless/00301_csv.sh
index 50c64b312a7..b2618343dc0 100755
--- a/tests/queries/0_stateless/00301_csv.sh
+++ b/tests/queries/0_stateless/00301_csv.sh
@@ -18,7 +18,7 @@ Hello "world", 789 ,2016-01-03
 $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY d, s";
 $CLICKHOUSE_CLIENT --query="DROP TABLE csv";
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE csv (t DateTime('Europe/Moscow'), s String) ENGINE = Memory";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE csv (t DateTime('Asia/Istanbul'), s String) ENGINE = Memory";
 
 echo '"2016-01-01 01:02:03","1"
 2016-01-02 01:02:03, "2"
@@ -29,7 +29,7 @@ $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY s";
 $CLICKHOUSE_CLIENT --query="DROP TABLE csv";
 
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE csv (t Nullable(DateTime('Europe/Moscow')), s Nullable(String)) ENGINE = Memory";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE csv (t Nullable(DateTime('Asia/Istanbul')), s Nullable(String)) ENGINE = Memory";
 
 echo 'NULL, NULL
 "2016-01-01 01:02:03",NUL
diff --git a/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh b/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
index 91ca0d7d869..f559b9d75bd 100755
--- a/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
+++ b/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
@@ -26,7 +26,7 @@ $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS json_noisy"
 
 echo
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS json_each_row"
-$CLICKHOUSE_CLIENT -q "CREATE TABLE json_each_row (d DateTime('Europe/Moscow')) ENGINE = Memory"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE json_each_row (d DateTime('Asia/Istanbul')) ENGINE = Memory"
 echo '{"d" : "2017-08-31 18:36:48", "t" : ""}
 {"d" : "1504193808", "t" : -1}
 {"d" : 1504193808, "t" : []}
diff --git a/tests/queries/0_stateless/00417_kill_query.sh b/tests/queries/0_stateless/00417_kill_query.sh
index e40eb5c3f80..c3b57b8ef3f 100755
--- a/tests/queries/0_stateless/00417_kill_query.sh
+++ b/tests/queries/0_stateless/00417_kill_query.sh
@@ -22,4 +22,3 @@ $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE 0 FORMAT TabSeparated"
 $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE 0 SYNC FORMAT TabSeparated"
 $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE 1 TEST" &>/dev/null
 
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/00502_sum_map.reference b/tests/queries/0_stateless/00502_sum_map.reference
index efd5a5534d4..31b067a2bc9 100644
--- a/tests/queries/0_stateless/00502_sum_map.reference
+++ b/tests/queries/0_stateless/00502_sum_map.reference
@@ -16,7 +16,7 @@
 ([1],[1])
 ([1],[1])
 (['a'],[1])
-(['1970-01-01 03:00:01'],[1])
+(['1970-01-01 02:00:01'],[1])
 (['1970-01-02'],[1])
 (['01234567-89ab-cdef-0123-456789abcdef'],[1])
 ([1.01],[1])
diff --git a/tests/queries/0_stateless/00502_sum_map.sql b/tests/queries/0_stateless/00502_sum_map.sql
index 3ceb5b82952..acc87cc5f16 100644
--- a/tests/queries/0_stateless/00502_sum_map.sql
+++ b/tests/queries/0_stateless/00502_sum_map.sql
@@ -31,7 +31,7 @@ select sumMap(val, cnt) from ( SELECT [ CAST(1, 'UInt64') ] as val, [1] as cnt )
 select sumMap(val, cnt) from ( SELECT [ CAST(1, 'Float64') ] as val, [1] as cnt );
 select sumMap(val, cnt) from ( SELECT [ CAST('a', 'Enum16(\'a\'=1)') ] as val, [1] as cnt );
 
-select sumMap(val, cnt) from ( SELECT [ CAST(1, 'DateTime(\'Europe/Moscow\')') ] as val, [1] as cnt );
+select sumMap(val, cnt) from ( SELECT [ CAST(1, 'DateTime(\'Asia/Istanbul\')') ] as val, [1] as cnt );
 select sumMap(val, cnt) from ( SELECT [ CAST(1, 'Date') ] as val, [1] as cnt );
 select sumMap(val, cnt) from ( SELECT [ CAST('01234567-89ab-cdef-0123-456789abcdef', 'UUID') ] as val, [1] as cnt );
 select sumMap(val, cnt) from ( SELECT [ CAST(1.01, 'Decimal(10,2)') ] as val, [1] as cnt );
diff --git a/tests/queries/0_stateless/00506_shard_global_in_union.reference b/tests/queries/0_stateless/00506_shard_global_in_union.reference
index 0ba9c36de26..c8fbaaf12a5 100644
--- a/tests/queries/0_stateless/00506_shard_global_in_union.reference
+++ b/tests/queries/0_stateless/00506_shard_global_in_union.reference
@@ -9,14 +9,14 @@ NOW BAD ==========================:
 34
 finish ===========================;
  * A UNION * B:
-A	1970-01-01 03:00:01
-B	1970-01-01 03:00:02
+A	1970-01-01 02:00:01
+B	1970-01-01 02:00:02
  Event, Datetime A UNION * B:
-A	1970-01-01 03:00:01
-B	1970-01-01 03:00:02
+A	1970-01-01 02:00:01
+B	1970-01-01 02:00:02
  * A UNION Event, Datetime B:
-A	1970-01-01 03:00:01
-B	1970-01-01 03:00:02
+A	1970-01-01 02:00:01
+B	1970-01-01 02:00:02
  Event, Datetime A UNION Event, Datetime B:
-A	1970-01-01 03:00:01
-B	1970-01-01 03:00:02
+A	1970-01-01 02:00:01
+B	1970-01-01 02:00:02
diff --git a/tests/queries/0_stateless/00506_shard_global_in_union.sql b/tests/queries/0_stateless/00506_shard_global_in_union.sql
index b3009add7e5..e51c18c5678 100644
--- a/tests/queries/0_stateless/00506_shard_global_in_union.sql
+++ b/tests/queries/0_stateless/00506_shard_global_in_union.sql
@@ -22,7 +22,7 @@ DROP TABLE IF EXISTS union_bug;
 
 CREATE TABLE union_bug (
     Event String,
-    Datetime DateTime('Europe/Moscow')
+    Datetime DateTime('Asia/Istanbul')
 ) Engine = Memory;
 
 INSERT INTO union_bug VALUES ('A', 1), ('B', 2);
diff --git a/tests/queries/0_stateless/00512_fractional_time_zones.sh b/tests/queries/0_stateless/00512_fractional_time_zones.sh
index 45be8fe8d17..eb459d22704 100755
--- a/tests/queries/0_stateless/00512_fractional_time_zones.sh
+++ b/tests/queries/0_stateless/00512_fractional_time_zones.sh
@@ -4,6 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-TZ=Europe/Moscow ${CLICKHOUSE_LOCAL} --query="SELECT toDateTime('1990-10-19 00:00:00')"
+TZ=Asia/Istanbul ${CLICKHOUSE_LOCAL} --query="SELECT toDateTime('1990-10-19 00:00:00')"
 TZ=Asia/Colombo ${CLICKHOUSE_LOCAL} --query="SELECT toDateTime('1990-10-19 00:00:00')"
 TZ=Asia/Kathmandu ${CLICKHOUSE_LOCAL} --query="SELECT toDateTime('1990-10-19 00:00:00')"
diff --git a/tests/queries/0_stateless/00515_enhanced_time_zones.sql b/tests/queries/0_stateless/00515_enhanced_time_zones.sql
index cae487dfab6..e555b6b87bc 100644
--- a/tests/queries/0_stateless/00515_enhanced_time_zones.sql
+++ b/tests/queries/0_stateless/00515_enhanced_time_zones.sql
@@ -1,6 +1,6 @@
-SELECT addMonths(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'), 1, 'Asia/Kolkata');
+SELECT addMonths(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 1, 'Asia/Kolkata');
 SELECT addMonths(toDateTime('2017-11-05 10:37:47', 'Asia/Kolkata'), 1);
-SELECT addMonths(toTimeZone(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'), 'Asia/Kolkata'), 1);
+SELECT addMonths(toTimeZone(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolkata'), 1);
 
 SELECT addMonths(toDateTime('2017-11-05 08:07:47'), 1);
 SELECT addMonths(materialize(toDateTime('2017-11-05 08:07:47')), 1);
@@ -12,11 +12,11 @@ SELECT addMonths(materialize(toDateTime('2017-11-05 08:07:47')), -1);
 SELECT addMonths(toDateTime('2017-11-05 08:07:47'), materialize(-1));
 SELECT addMonths(materialize(toDateTime('2017-11-05 08:07:47')), materialize(-1));
 
-SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Europe/Moscow');
-SELECT toUnixTimestamp(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'), 'Europe/Moscow');
+SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Istanbul');
+SELECT toUnixTimestamp(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Istanbul');
 
-SELECT toDateTime('2017-11-05 08:07:47', 'Europe/Moscow');
-SELECT toTimeZone(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'), 'Asia/Kolkata');
-SELECT toString(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'));
-SELECT toString(toTimeZone(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'), 'Asia/Kolkata'));
-SELECT toString(toDateTime('2017-11-05 08:07:47', 'Europe/Moscow'), 'Asia/Kolkata');
+SELECT toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul');
+SELECT toTimeZone(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolkata');
+SELECT toString(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'));
+SELECT toString(toTimeZone(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolkata'));
+SELECT toString(toDateTime('2017-11-05 08:07:47', 'Asia/Istanbul'), 'Asia/Kolkata');
diff --git a/tests/queries/0_stateless/00538_datediff.sql b/tests/queries/0_stateless/00538_datediff.sql
index b76ab4ff3f8..5dc416ad0bd 100644
--- a/tests/queries/0_stateless/00538_datediff.sql
+++ b/tests/queries/0_stateless/00538_datediff.sql
@@ -43,12 +43,12 @@ SELECT DATEDIFF('year', today(), today() - INTERVAL 10 YEAR);
 
 SELECT 'Dependance of timezones';
 
-SELECT dateDiff('month', toDate('2014-10-26'), toDate('2014-10-27'), 'Europe/Moscow');
-SELECT dateDiff('week', toDate('2014-10-26'), toDate('2014-10-27'), 'Europe/Moscow');
-SELECT dateDiff('day', toDate('2014-10-26'), toDate('2014-10-27'), 'Europe/Moscow');
-SELECT dateDiff('hour', toDate('2014-10-26'), toDate('2014-10-27'), 'Europe/Moscow');
-SELECT dateDiff('minute', toDate('2014-10-26'), toDate('2014-10-27'), 'Europe/Moscow');
-SELECT dateDiff('second', toDate('2014-10-26'), toDate('2014-10-27'), 'Europe/Moscow');
+SELECT dateDiff('month', toDate('2014-10-26'), toDate('2014-10-27'), 'Asia/Istanbul');
+SELECT dateDiff('week', toDate('2014-10-26'), toDate('2014-10-27'), 'Asia/Istanbul');
+SELECT dateDiff('day', toDate('2014-10-26'), toDate('2014-10-27'), 'Asia/Istanbul');
+SELECT dateDiff('hour', toDate('2014-10-26'), toDate('2014-10-27'), 'Asia/Istanbul');
+SELECT dateDiff('minute', toDate('2014-10-26'), toDate('2014-10-27'), 'Asia/Istanbul');
+SELECT dateDiff('second', toDate('2014-10-26'), toDate('2014-10-27'), 'Asia/Istanbul');
 
 SELECT dateDiff('month', toDate('2014-10-26'), toDate('2014-10-27'), 'UTC');
 SELECT dateDiff('week', toDate('2014-10-26'), toDate('2014-10-27'), 'UTC');
@@ -57,12 +57,12 @@ SELECT dateDiff('hour', toDate('2014-10-26'), toDate('2014-10-27'), 'UTC');
 SELECT dateDiff('minute', toDate('2014-10-26'), toDate('2014-10-27'), 'UTC');
 SELECT dateDiff('second', toDate('2014-10-26'), toDate('2014-10-27'), 'UTC');
 
-SELECT dateDiff('month', toDateTime('2014-10-26 00:00:00', 'Europe/Moscow'), toDateTime('2014-10-27 00:00:00', 'Europe/Moscow'));
-SELECT dateDiff('week', toDateTime('2014-10-26 00:00:00', 'Europe/Moscow'), toDateTime('2014-10-27 00:00:00', 'Europe/Moscow'));
-SELECT dateDiff('day', toDateTime('2014-10-26 00:00:00', 'Europe/Moscow'), toDateTime('2014-10-27 00:00:00', 'Europe/Moscow'));
-SELECT dateDiff('hour', toDateTime('2014-10-26 00:00:00', 'Europe/Moscow'), toDateTime('2014-10-27 00:00:00', 'Europe/Moscow'));
-SELECT dateDiff('minute', toDateTime('2014-10-26 00:00:00', 'Europe/Moscow'), toDateTime('2014-10-27 00:00:00', 'Europe/Moscow'));
-SELECT dateDiff('second', toDateTime('2014-10-26 00:00:00', 'Europe/Moscow'), toDateTime('2014-10-27 00:00:00', 'Europe/Moscow'));
+SELECT dateDiff('month', toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul'), toDateTime('2014-10-27 00:00:00', 'Asia/Istanbul'));
+SELECT dateDiff('week', toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul'), toDateTime('2014-10-27 00:00:00', 'Asia/Istanbul'));
+SELECT dateDiff('day', toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul'), toDateTime('2014-10-27 00:00:00', 'Asia/Istanbul'));
+SELECT dateDiff('hour', toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul'), toDateTime('2014-10-27 00:00:00', 'Asia/Istanbul'));
+SELECT dateDiff('minute', toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul'), toDateTime('2014-10-27 00:00:00', 'Asia/Istanbul'));
+SELECT dateDiff('second', toDateTime('2014-10-26 00:00:00', 'Asia/Istanbul'), toDateTime('2014-10-27 00:00:00', 'Asia/Istanbul'));
 
 SELECT dateDiff('month', toDateTime('2014-10-26 00:00:00', 'UTC'), toDateTime('2014-10-27 00:00:00', 'UTC'));
 SELECT dateDiff('week', toDateTime('2014-10-26 00:00:00', 'UTC'), toDateTime('2014-10-27 00:00:00', 'UTC'));
diff --git a/tests/queries/0_stateless/00561_storage_join.sql b/tests/queries/0_stateless/00561_storage_join.sql
index ad4fab09c20..913ecec6f4a 100644
--- a/tests/queries/0_stateless/00561_storage_join.sql
+++ b/tests/queries/0_stateless/00561_storage_join.sql
@@ -1,7 +1,7 @@
 drop table IF EXISTS joinbug;
 
 CREATE TABLE joinbug (
-  event_date Date MATERIALIZED toDate(created, 'Europe/Moscow'),
+  event_date Date MATERIALIZED toDate(created, 'Asia/Istanbul'),
   id UInt64,
   id2 UInt64,
   val UInt64,
diff --git a/tests/queries/0_stateless/00718_format_datetime.sql b/tests/queries/0_stateless/00718_format_datetime.sql
index cd679fe9735..899e23f9da1 100644
--- a/tests/queries/0_stateless/00718_format_datetime.sql
+++ b/tests/queries/0_stateless/00718_format_datetime.sql
@@ -42,4 +42,4 @@ SELECT formatDateTime(toDateTime('2018-01-02 22:33:44'), 'no formatting pattern'
 SELECT formatDateTime(toDate('2018-01-01'), '%F %T');
 SELECT
     formatDateTime(toDateTime('2018-01-01 01:00:00', 'UTC'), '%F %T', 'UTC'),
-    formatDateTime(toDateTime('2018-01-01 01:00:00', 'UTC'), '%F %T', 'Europe/Moscow')
\ No newline at end of file
+    formatDateTime(toDateTime('2018-01-01 01:00:00', 'UTC'), '%F %T', 'Asia/Istanbul')
\ No newline at end of file
diff --git a/tests/queries/0_stateless/00719_format_datetime_rand.sql b/tests/queries/0_stateless/00719_format_datetime_rand.sql
index b91c988e1ca..ee596912bc7 100644
--- a/tests/queries/0_stateless/00719_format_datetime_rand.sql
+++ b/tests/queries/0_stateless/00719_format_datetime_rand.sql
@@ -8,4 +8,4 @@ WITH toDate(today() + rand() % 4096) AS t SELECT count() FROM numbers(1000000) W
 
 -- Note: in some other timezones, daylight saving time change happens in midnight, so the first time of day is 01:00:00 instead of 00:00:00.
 -- Stick to Moscow timezone to avoid this issue.
-WITH toDate(today() + rand() % 4096) AS t SELECT count() FROM numbers(1000000) WHERE formatDateTime(t, '%F %T', 'Europe/Moscow') != toString(toDateTime(t, 'Europe/Moscow'));
+WITH toDate(today() + rand() % 4096) AS t SELECT count() FROM numbers(1000000) WHERE formatDateTime(t, '%F %T', 'Asia/Istanbul') != toString(toDateTime(t, 'Asia/Istanbul'));
diff --git a/tests/queries/0_stateless/00735_long_conditional.reference b/tests/queries/0_stateless/00735_long_conditional.reference
index 082c2d49de9..05383d6e1f0 100644
--- a/tests/queries/0_stateless/00735_long_conditional.reference
+++ b/tests/queries/0_stateless/00735_long_conditional.reference
@@ -92,9 +92,9 @@ value vs value
 0	1	1	UInt64	Decimal(18, 0)	Decimal(38, 0)
 0	1	1	UInt64	Decimal(38, 0)	Decimal(38, 0)
 1970-01-01	1970-01-02	1970-01-02	Date	Date	Date
-2000-01-01	2000-01-01 00:00:01	2000-01-01 00:00:01	Date	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')
-2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00	DateTime(\'Europe/Moscow\')	Date	DateTime(\'Europe/Moscow\')
-1970-01-01 03:00:00	1970-01-01 03:00:01	1970-01-01 03:00:01	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')
+2000-01-01	2000-01-01 00:00:01	2000-01-01 00:00:01	Date	DateTime(\'Asia/Istanbul\')	DateTime(\'Asia/Istanbul\')
+2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00	DateTime(\'Asia/Istanbul\')	Date	DateTime(\'Asia/Istanbul\')
+1970-01-01 02:00:00	1970-01-01 02:00:01	1970-01-01 02:00:01	DateTime(\'Asia/Istanbul\')	DateTime(\'Asia/Istanbul\')	DateTime(\'Asia/Istanbul\')
 column vs value
 0	1	1	Int8	Int8	Int8
 0	1	1	Int8	Int16	Int16
@@ -189,6 +189,6 @@ column vs value
 0	1	1	UInt64	Decimal(18, 0)	Decimal(38, 0)
 0	1	1	UInt64	Decimal(38, 0)	Decimal(38, 0)
 1970-01-01	1970-01-02	1970-01-02	Date	Date	Date
-2000-01-01	2000-01-01 00:00:01	2000-01-01 00:00:01	Date	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')
-2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00	DateTime(\'Europe/Moscow\')	Date	DateTime(\'Europe/Moscow\')
-1970-01-01 03:00:00	1970-01-01 03:00:01	1970-01-01 03:00:01	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')
+2000-01-01	2000-01-01 00:00:01	2000-01-01 00:00:01	Date	DateTime(\'Asia/Istanbul\')	DateTime(\'Asia/Istanbul\')
+2000-01-01 00:00:00	2000-01-02	2000-01-02 00:00:00	DateTime(\'Asia/Istanbul\')	Date	DateTime(\'Asia/Istanbul\')
+1970-01-01 02:00:00	1970-01-01 02:00:01	1970-01-01 02:00:01	DateTime(\'Asia/Istanbul\')	DateTime(\'Asia/Istanbul\')	DateTime(\'Asia/Istanbul\')
diff --git a/tests/queries/0_stateless/00735_long_conditional.sql b/tests/queries/0_stateless/00735_long_conditional.sql
index 73febad1310..662c87db48f 100644
--- a/tests/queries/0_stateless/00735_long_conditional.sql
+++ b/tests/queries/0_stateless/00735_long_conditional.sql
@@ -15,7 +15,7 @@ SELECT toInt8(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x),
 SELECT toInt8(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt8(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt8(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toInt8(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toInt8(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toInt8(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt8(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt8(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -31,7 +31,7 @@ SELECT toInt16(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x),
 SELECT toInt16(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt16(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt16(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toInt16(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toInt16(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toInt16(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt16(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt16(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -47,7 +47,7 @@ SELECT toInt32(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x),
 SELECT toInt32(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt32(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt32(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toInt32(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toInt32(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toInt32(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt32(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt32(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -63,7 +63,7 @@ SELECT toInt64(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x),
 SELECT toInt64(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toInt64(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toInt64(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toInt64(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toInt64(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toInt64(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt64(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toInt64(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -79,7 +79,7 @@ SELECT toUInt8(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x),
 SELECT toUInt8(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt8(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt8(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toUInt8(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toUInt8(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toUInt8(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt8(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt8(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -95,7 +95,7 @@ SELECT toUInt16(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x)
 SELECT toUInt16(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt16(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt16(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toUInt16(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toUInt16(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toUInt16(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt16(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt16(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -111,7 +111,7 @@ SELECT toUInt32(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x)
 SELECT toUInt32(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt32(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt32(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toUInt32(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toUInt32(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toUInt32(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt32(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt32(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -127,7 +127,7 @@ SELECT toUInt64(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x)
 SELECT toUInt64(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toUInt64(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toUInt64(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT toUInt64(0) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toUInt64(0) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT toUInt64(0) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt64(0) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toUInt64(0) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -143,26 +143,26 @@ SELECT toDate(0) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x),
 SELECT toDate(0) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT toDate(0) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT toDate(0) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
-SELECT toDate('2000-01-01') AS x, toDateTime('2000-01-01 00:00:01', 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
+SELECT toDate('2000-01-01') AS x, toDateTime('2000-01-01 00:00:01', 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT toDate(0) AS x, toDecimal32(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT toDate(0) AS x, toDecimal64(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT toDate(0) AS x, toDecimal128(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toUInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toUInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toUInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, toDate('2000-01-02') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toDecimal32(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toDecimal64(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT toDateTime(0, 'Europe/Moscow') AS x, toDecimal128(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toUInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toUInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toUInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, toDate('2000-01-02') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toDecimal32(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toDecimal64(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT toDateTime(0, 'Asia/Istanbul') AS x, toDecimal128(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 
 SELECT 'column vs value';
 
@@ -177,7 +177,7 @@ SELECT materialize(toInt8(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, to
 SELECT materialize(toInt8(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt8(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt8(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toInt8(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toInt8(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toInt8(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt8(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt8(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -193,7 +193,7 @@ SELECT materialize(toInt16(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, t
 SELECT materialize(toInt16(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt16(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt16(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toInt16(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toInt16(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toInt16(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt16(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt16(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -209,7 +209,7 @@ SELECT materialize(toInt32(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, t
 SELECT materialize(toInt32(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt32(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt32(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toInt32(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toInt32(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toInt32(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt32(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt32(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -225,7 +225,7 @@ SELECT materialize(toInt64(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, t
 SELECT materialize(toInt64(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toInt64(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toInt64(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toInt64(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toInt64(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toInt64(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt64(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toInt64(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -241,7 +241,7 @@ SELECT materialize(toUInt8(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, t
 SELECT materialize(toUInt8(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt8(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt8(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toUInt8(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toUInt8(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toUInt8(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt8(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt8(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -257,7 +257,7 @@ SELECT materialize(toUInt16(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z,
 SELECT materialize(toUInt16(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt16(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt16(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toUInt16(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toUInt16(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toUInt16(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt16(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt16(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -273,7 +273,7 @@ SELECT materialize(toUInt32(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z,
 SELECT materialize(toUInt32(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt32(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt32(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toUInt32(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toUInt32(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toUInt32(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt32(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt32(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -289,7 +289,7 @@ SELECT materialize(toUInt64(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z,
 SELECT materialize(toUInt64(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toUInt64(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toUInt64(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
-SELECT materialize(toUInt64(0)) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toUInt64(0)) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
 SELECT materialize(toUInt64(0)) AS x, toDecimal32(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt64(0)) AS x, toDecimal64(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toUInt64(0)) AS x, toDecimal128(1, 0) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
@@ -305,23 +305,23 @@ SELECT materialize(toDate(0)) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, to
 SELECT materialize(toDate(0)) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT materialize(toDate(0)) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT materialize(toDate(0)) AS x, toDate(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
-SELECT materialize(toDate('2000-01-01')) AS x, toDateTime('2000-01-01 00:00:01', 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
+SELECT materialize(toDate('2000-01-01')) AS x, toDateTime('2000-01-01 00:00:01', 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
 SELECT materialize(toDate(0)) AS x, toDecimal32(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT materialize(toDate(0)) AS x, toDecimal64(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 SELECT materialize(toDate(0)) AS x, toDecimal128(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 43 }
 
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toUInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toUInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toUInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, toDate('2000-01-02') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toDateTime(1, 'Europe/Moscow') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toDecimal32(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toDecimal64(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
-SELECT materialize(toDateTime(0, 'Europe/Moscow')) AS x, toDecimal128(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toUInt8(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toUInt16(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toUInt32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toUInt64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toFloat32(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toFloat64(1) AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, toDate('2000-01-02') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toDateTime(1, 'Asia/Istanbul') AS y, ((x > y) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z);
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toDecimal32(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toDecimal64(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
+SELECT materialize(toDateTime(0, 'Asia/Istanbul')) AS x, toDecimal128(1, 0) AS y, ((x = 0) ? x : y) AS z, toTypeName(x), toTypeName(y), toTypeName(z); -- { serverError 386 }
diff --git a/tests/queries/0_stateless/00746_sql_fuzzy.sh b/tests/queries/0_stateless/00746_sql_fuzzy.sh
index 72e80956f59..b534b1820ba 100755
--- a/tests/queries/0_stateless/00746_sql_fuzzy.sh
+++ b/tests/queries/0_stateless/00746_sql_fuzzy.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -15,7 +14,7 @@ $CLICKHOUSE_CLIENT -q "select name from system.table_functions format TSV;" > "$
 # if you want long run use: env SQL_FUZZY_RUNS=100000 clickhouse-test sql_fuzzy
 
 for SQL_FUZZY_RUN in $(seq "${SQL_FUZZY_RUNS:=5}"); do
-    env SQL_FUZZY_RUN="$SQL_FUZZY_RUN" perl "$CURDIR"/00746_sql_fuzzy.pl | clickhouse_client_timeout 60 $CLICKHOUSE_CLIENT --format Null --max_execution_time 10 -n --ignore-error >/dev/null 2>&1
+    env SQL_FUZZY_RUN="$SQL_FUZZY_RUN" perl "$CURDIR"/00746_sql_fuzzy.pl | timeout 60 $CLICKHOUSE_CLIENT --format Null --max_execution_time 10 -n --ignore-error >/dev/null 2>&1
     if [[ $($CLICKHOUSE_CLIENT -q "SELECT 'Still alive'") != 'Still alive' ]]; then
         break
     fi
diff --git a/tests/queries/0_stateless/00801_daylight_saving_time_hour_underflow.sql b/tests/queries/0_stateless/00801_daylight_saving_time_hour_underflow.sql
index fa98d087a62..a86a863124c 100644
--- a/tests/queries/0_stateless/00801_daylight_saving_time_hour_underflow.sql
+++ b/tests/queries/0_stateless/00801_daylight_saving_time_hour_underflow.sql
@@ -1,6 +1,6 @@
 -- See comment in DateLUTImpl.cpp: "We doesn't support cases when time change results in switching to previous day..."
 SELECT
-    ignore(toDateTime(370641600, 'Europe/Moscow') AS t),
+    ignore(toDateTime(370641600, 'Asia/Istanbul') AS t),
     replaceRegexpAll(toString(t), '\\d', 'x'),
     toHour(t) < 24,
     replaceRegexpAll(formatDateTime(t, '%Y-%m-%d %H:%M:%S; %R:%S; %F %T'), '\\d', 'x');
diff --git a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
index 8e04ce7ff1e..19d9b006cd7 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -7,51 +7,64 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -nm -q "
-    DROP TABLE IF EXISTS concurrent_alter_column;
-    CREATE TABLE concurrent_alter_column (ts DATETIME) ENGINE = MergeTree PARTITION BY toStartOfDay(ts) ORDER BY tuple();
-"
+echo "DROP TABLE IF EXISTS concurrent_alter_column" | ${CLICKHOUSE_CLIENT}
+echo "CREATE TABLE concurrent_alter_column (ts DATETIME) ENGINE = MergeTree PARTITION BY toStartOfDay(ts) ORDER BY tuple()" | ${CLICKHOUSE_CLIENT}
+
 function thread1()
 {
-    for i in {1..500}; do
-        echo "ALTER TABLE concurrent_alter_column ADD COLUMN c$i DOUBLE;"
-    done | ${CLICKHOUSE_CLIENT} -n
+    while true; do
+        for i in {1..500}; do echo "ALTER TABLE concurrent_alter_column ADD COLUMN c$i DOUBLE;"; done | ${CLICKHOUSE_CLIENT} -n --query_id=alter_00816_1
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_column ADD COLUMN d DOUBLE"
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_column DROP COLUMN d"
+    while true; do
+        echo "ALTER TABLE concurrent_alter_column ADD COLUMN d DOUBLE" | ${CLICKHOUSE_CLIENT} --query_id=alter_00816_2;
+        sleep "$(echo 0.0$RANDOM)";
+        echo "ALTER TABLE concurrent_alter_column DROP COLUMN d" | ${CLICKHOUSE_CLIENT} --query_id=alter_00816_2;
+    done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_column ADD COLUMN e DOUBLE"
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_column DROP COLUMN e"
+    while true; do
+        echo "ALTER TABLE concurrent_alter_column ADD COLUMN e DOUBLE" | ${CLICKHOUSE_CLIENT} --query_id=alter_00816_3;
+        sleep "$(echo 0.0$RANDOM)";
+        echo "ALTER TABLE concurrent_alter_column DROP COLUMN e" | ${CLICKHOUSE_CLIENT} --query_id=alter_00816_3;
+    done
 }
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_column ADD COLUMN f DOUBLE"
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_column DROP COLUMN f"
+    while true; do
+        echo "ALTER TABLE concurrent_alter_column ADD COLUMN f DOUBLE" | ${CLICKHOUSE_CLIENT} --query_id=alter_00816_4;
+        sleep "$(echo 0.0$RANDOM)";
+        echo "ALTER TABLE concurrent_alter_column DROP COLUMN f" | ${CLICKHOUSE_CLIENT} --query_id=alter_00816_4;
+    done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
 
 wait
 
-$CLICKHOUSE_CLIENT -q "DROP TABLE concurrent_alter_column NO DELAY"
+echo "DROP TABLE concurrent_alter_column NO DELAY" | ${CLICKHOUSE_CLIENT}   # NO DELAY has effect only for Atomic database
+
+# Wait for alters and check for deadlocks (in case of deadlock this loop will not finish)
+while true; do
+    echo "SELECT * FROM system.processes WHERE query_id LIKE 'alter\\_00816\\_%'" | ${CLICKHOUSE_CLIENT} | grep -q -F 'alter' || break
+    sleep 1;
+done
+
 echo 'did not crash'
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
index df8b149d7be..284d82af0f0 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -32,7 +32,7 @@ CREATE TABLE persons_00825 (uuid UUID,
                             photo Nullable(String),
                             phoneNumber Nullable(FixedString(13)),
                             isOnline UInt8,
-                            visitTime Nullable(DateTime('Europe/Moscow')),
+                            visitTime Nullable(DateTime('Asia/Istanbul')),
                             age UInt8,
                             zodiacSign Enum16('aries'=321, 'taurus'=420, 'gemini'=521, 'cancer'=621, 'leo'=723, 'virgo'=823,
                                               'libra'=923, 'scorpius'=1023, 'sagittarius'=1122, 'capricorn'=1222, 'aquarius'=120,
@@ -51,9 +51,9 @@ CREATE TABLE persons_00825 (uuid UUID,
                             "nestiness_a_B.c_E" Array(UInt32)
                            ) ENGINE = MergeTree ORDER BY tuple();
 
-INSERT INTO persons_00825 VALUES (toUUID('a7522158-3d41-4b77-ad69-6c598ee55c49'), 'Ivan', 'Petrov', 'male', toDate('1980-12-29'), 'png', '+74951234567', 1, toDateTime('2019-01-05 18:45:00', 'Europe/Moscow'), 38, 'capricorn', ['Yesterday', 'Flowers'], [255, 0, 0], 'Moscow', [55.753215, 37.622504], 3.14, 214.10, 0.1, 5.8, 17060000000, ['meter', 'centimeter', 'kilometer'], [1, 0.01, 1000], 500, [501, 502]);
+INSERT INTO persons_00825 VALUES (toUUID('a7522158-3d41-4b77-ad69-6c598ee55c49'), 'Ivan', 'Petrov', 'male', toDate('1980-12-29'), 'png', '+74951234567', 1, toDateTime('2019-01-05 18:45:00', 'Asia/Istanbul'), 38, 'capricorn', ['Yesterday', 'Flowers'], [255, 0, 0], 'Moscow', [55.753215, 37.622504], 3.14, 214.10, 0.1, 5.8, 17060000000, ['meter', 'centimeter', 'kilometer'], [1, 0.01, 1000], 500, [501, 502]);
 INSERT INTO persons_00825 VALUES (toUUID('c694ad8a-f714-4ea3-907d-fd54fb25d9b5'), 'Natalia', 'Sokolova', 'female', toDate('1992-03-08'), 'jpg', NULL, 0, NULL, 26, 'pisces', [], [100, 200, 50], 'Plymouth', [50.403724, -4.142123], 3.14159, NULL, 0.007, 5.4, -20000000000000, [], [], NULL, []);
-INSERT INTO persons_00825 VALUES (toUUID('a7da1aa6-f425-4789-8947-b034786ed374'), 'Vasily', 'Sidorov', 'male', toDate('1995-07-28'), 'bmp', '+442012345678', 1, toDateTime('2018-12-30 00:00:00', 'Europe/Moscow'), 23, 'leo', ['Sunny'], [250, 244, 10], 'Murmansk', [68.970682, 33.074981], 3.14159265358979, 100000000000, 800, -3.2, 154400000, ['pound'], [16], 503, []);
+INSERT INTO persons_00825 VALUES (toUUID('a7da1aa6-f425-4789-8947-b034786ed374'), 'Vasily', 'Sidorov', 'male', toDate('1995-07-28'), 'bmp', '+442012345678', 1, toDateTime('2018-12-30 00:00:00', 'Asia/Istanbul'), 23, 'leo', ['Sunny'], [250, 244, 10], 'Murmansk', [68.970682, 33.074981], 3.14159265358979, 100000000000, 800, -3.2, 154400000, ['pound'], [16], 503, []);
 
 SELECT * FROM persons_00825 ORDER BY name;
 EOF
diff --git a/tests/queries/0_stateless/00835_if_generic_case.sql b/tests/queries/0_stateless/00835_if_generic_case.sql
index 011cea46ffc..63baffcf17d 100644
--- a/tests/queries/0_stateless/00835_if_generic_case.sql
+++ b/tests/queries/0_stateless/00835_if_generic_case.sql
@@ -1,17 +1,17 @@
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, materialize(toDate('2000-01-02')) AS y, x > y ? x : y AS z;
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, materialize(toDate('2000-01-02')) AS y, x > y ? x : y AS z;
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, toDate('2000-01-02') AS y, x > y ? x : y AS z;
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, materialize(toDate('2000-01-02')) AS y, x > y ? x : y AS z;
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, materialize(toDate('2000-01-02')) AS y, x > y ? x : y AS z;
 
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, toDate('2000-01-02') AS y, 0 ? x : y AS z;
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, toDate('2000-01-02') AS y, 0 ? x : y AS z;
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, materialize(toDate('2000-01-02')) AS y, 0 ? x : y AS z;
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, materialize(toDate('2000-01-02')) AS y, 0 ? x : y AS z;
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, toDate('2000-01-02') AS y, 0 ? x : y AS z;
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, toDate('2000-01-02') AS y, 0 ? x : y AS z;
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, materialize(toDate('2000-01-02')) AS y, 0 ? x : y AS z;
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, materialize(toDate('2000-01-02')) AS y, 0 ? x : y AS z;
 
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, toDate('2000-01-02') AS y, 1 ? x : y AS z;
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, toDate('2000-01-02') AS y, 1 ? x : y AS z;
-SELECT toDateTime('2000-01-01 00:00:00', 'Europe/Moscow') AS x, materialize(toDate('2000-01-02')) AS y, 1 ? x : y AS z;
-SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Europe/Moscow')) AS x, materialize(toDate('2000-01-02')) AS y, 1 ? x : y AS z;
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, toDate('2000-01-02') AS y, 1 ? x : y AS z;
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, toDate('2000-01-02') AS y, 1 ? x : y AS z;
+SELECT toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul') AS x, materialize(toDate('2000-01-02')) AS y, 1 ? x : y AS z;
+SELECT materialize(toDateTime('2000-01-01 00:00:00', 'Asia/Istanbul')) AS x, materialize(toDate('2000-01-02')) AS y, 1 ? x : y AS z;
 
 SELECT rand() % 2 = 0 ? number : number FROM numbers(5);
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
index b295a226853..72ec99ad2c6 100644
--- a/tests/queries/0_stateless/00900_long_parquet_load.reference
+++ b/tests/queries/0_stateless/00900_long_parquet_load.reference
@@ -3,8 +3,8 @@
 1	0	1	1	1	10	1.1	10.1	01/01/09	1	1230768060
 === Try load data from alltypes_list.parquet
 []	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
-[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['2000-01-01 00:00:00','2001-01-01 00:00:00','2002-01-01 00:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
-[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['2000-01-01 00:00:00','2001-01-01 00:00:00','2002-01-01 00:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
+[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['1999-12-31 23:00:00','2000-12-31 23:00:00','2001-12-31 23:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
+[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['1999-12-31 23:00:00','2000-12-31 23:00:00','2001-12-31 23:00:00']	[0.2,10,4]	[4,10000.1,10000.1]	[1000000000,90,101001.01]
 === Try load data from alltypes_plain.parquet
 4	1	0	0	0	0	0	0	03/01/09	0	1235865600
 5	0	1	1	1	10	1.1	10.1	03/01/09	1	1235865660
diff --git a/tests/queries/0_stateless/00900_orc_load.sh b/tests/queries/0_stateless/00900_orc_load.sh
index 3779092c511..b3f2c39e5d2 100755
--- a/tests/queries/0_stateless/00900_orc_load.sh
+++ b/tests/queries/0_stateless/00900_orc_load.sh
@@ -5,7 +5,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-DATA_FILE=$CUR_DIR/data_orc/test_$CLICKHOUSE_TEST_UNIQUE_NAME.orc
+DATA_FILE=$CUR_DIR/data_orc/test.orc
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS orc_load"
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE orc_load (int Int32, smallint Int8, bigint Int64, float Float32, double Float64, date Date, y String, datetime64 DateTime64(3)) ENGINE = Memory"
@@ -14,7 +14,7 @@ ${CLICKHOUSE_CLIENT} --query="select * from orc_load FORMAT ORC" > $DATA_FILE
 ${CLICKHOUSE_CLIENT} --query="truncate table orc_load"
 
 cat "$DATA_FILE"  | ${CLICKHOUSE_CLIENT} -q "insert into orc_load format ORC"
-clickhouse_client_timeout 3 ${CLICKHOUSE_CLIENT} -q "insert into orc_load format ORC" < $DATA_FILE
+timeout 3 ${CLICKHOUSE_CLIENT} -q "insert into orc_load format ORC" < $DATA_FILE
 ${CLICKHOUSE_CLIENT} --query="select * from orc_load"
 ${CLICKHOUSE_CLIENT} --query="drop table orc_load"
 rm -rf "$DATA_FILE"
diff --git a/tests/queries/0_stateless/00909_kill_not_initialized_query.sh b/tests/queries/0_stateless/00909_kill_not_initialized_query.sh
index 816bab4c491..531652a33e7 100755
--- a/tests/queries/0_stateless/00909_kill_not_initialized_query.sh
+++ b/tests/queries/0_stateless/00909_kill_not_initialized_query.sh
@@ -35,7 +35,7 @@ $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE query='$query_to_kill' ASYNC" &>/dev/nul
 sleep 1
 
 # Kill $query_for_pending SYNC. This query is not blocker, so it should be killed fast.
-clickhouse_client_timeout 20 ${CLICKHOUSE_CLIENT} -q "KILL QUERY WHERE query='$query_for_pending' SYNC" &>/dev/null
+timeout 20 ${CLICKHOUSE_CLIENT} -q "KILL QUERY WHERE query='$query_for_pending' SYNC" &>/dev/null
 
 # Both queries have to be killed, doesn't matter with SYNC or ASYNC kill
 for _ in {1..15}
diff --git a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
index cf0e0bac3dd..c6151d3bdee 100644
--- a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
+++ b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
@@ -8,7 +8,7 @@ select groupArray(s) from (select sum(n) s from (select toDecimal128(number, 10)
 
 DROP TABLE IF EXISTS sensor_value;
 CREATE TABLE sensor_value (
-    received_at DateTime('Europe/Moscow'),
+    received_at DateTime('Asia/Istanbul'),
     device_id UUID,
     sensor_id UUID,
     value Nullable(Decimal(18, 4)),
@@ -35,28 +35,28 @@ DROP TABLE sensor_value;
 select s.a, s.b, max(s.dt1) dt1, s.c, s.d, s.f, s.i, max(s.dt2) dt2 from (
     select toUInt64(4360430)                   a
         , toUInt64(5681495)                    b
-        , toDateTime('2018-11-01 10:44:58', 'Europe/Moscow')    dt1
+        , toDateTime('2018-11-01 10:44:58', 'Asia/Istanbul')    dt1
         , 'txt'                                c
         , toDecimal128('274.350000000000', 12) d
         , toDecimal128(268.970000000000, 12)   f
         , toDecimal128(0.000000000000, 12)     i
-        , toDateTime('2018-11-02 00:00:00', 'Europe/Moscow')    dt2
+        , toDateTime('2018-11-02 00:00:00', 'Asia/Istanbul')    dt2
     union all
     select toUInt64(4341757)                   a
         , toUInt64(5657967)                    b
-        , toDateTime('2018-11-01 16:47:46', 'Europe/Moscow')    dt1
+        , toDateTime('2018-11-01 16:47:46', 'Asia/Istanbul')    dt1
         , 'txt'                                c
         , toDecimal128('321.380000000000', 12) d
         , toDecimal128(315.080000000000, 12)   f
         , toDecimal128(0.000000000000, 12)     i
-        , toDateTime('2018-11-02 00:00:00', 'Europe/Moscow')    dt2
+        , toDateTime('2018-11-02 00:00:00', 'Asia/Istanbul')    dt2
     union all
     select toUInt64(4360430)                   a
         , toUInt64(5681495)                    b
-        , toDateTime('2018-11-02 09:00:07', 'Europe/Moscow')    dt1
+        , toDateTime('2018-11-02 09:00:07', 'Asia/Istanbul')    dt1
         , 'txt'                                c
         , toDecimal128('274.350000000000', 12) d
         , toDecimal128(268.970000000000, 12)   f
         , toDecimal128(0.000000000000, 12)     i
-        , toDateTime('2018-11-02 00:00:00', 'Europe/Moscow')    dt2
+        , toDateTime('2018-11-02 00:00:00', 'Asia/Istanbul')    dt2
 ) s group by s.a, s.b, s.c, s.d, s.f, s.i ORDER BY s.a, s.b, s.c, s.d, s.f, s.i;
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.python b/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
index fc8a229268b..e3cd7ee6d36 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.python
@@ -9,69 +9,69 @@ import argparse
 # Create SQL statement to verify dateTime64 is accepted as argument to functions taking DateTime.
 FUNCTIONS="""
 toTimeZone(N, 'UTC')
-toYear(N, 'Europe/Moscow')
-toQuarter(N, 'Europe/Moscow')
-toMonth(N, 'Europe/Moscow')
-toDayOfYear(N, 'Europe/Moscow')
-toDayOfMonth(N, 'Europe/Moscow')
-toDayOfWeek(N, 'Europe/Moscow')
-toHour(N, 'Europe/Moscow')
-toMinute(N, 'Europe/Moscow')
-toSecond(N, 'Europe/Moscow')
+toYear(N, 'Asia/Istanbul')
+toQuarter(N, 'Asia/Istanbul')
+toMonth(N, 'Asia/Istanbul')
+toDayOfYear(N, 'Asia/Istanbul')
+toDayOfMonth(N, 'Asia/Istanbul')
+toDayOfWeek(N, 'Asia/Istanbul')
+toHour(N, 'Asia/Istanbul')
+toMinute(N, 'Asia/Istanbul')
+toSecond(N, 'Asia/Istanbul')
 toUnixTimestamp(N)
-toStartOfYear(N, 'Europe/Moscow')
-toStartOfISOYear(N, 'Europe/Moscow')
-toStartOfQuarter(N, 'Europe/Moscow')
-toStartOfMonth(N, 'Europe/Moscow')
-toMonday(N, 'Europe/Moscow')
-toStartOfWeek(N, 'Europe/Moscow')
-toStartOfDay(N, 'Europe/Moscow')
-toStartOfHour(N, 'Europe/Moscow')
-toStartOfMinute(N, 'Europe/Moscow')
-toStartOfFiveMinutes(N, 'Europe/Moscow')
-toStartOfTenMinutes(N, 'Europe/Moscow')
-toStartOfFifteenMinutes(N, 'Europe/Moscow')
-toStartOfInterval(N, INTERVAL 1 year, 'Europe/Moscow')
-toStartOfInterval(N, INTERVAL 1 month, 'Europe/Moscow')
-toStartOfInterval(N, INTERVAL 1 day, 'Europe/Moscow')
-toStartOfInterval(N, INTERVAL 15 minute, 'Europe/Moscow')
-date_trunc('year', N, 'Europe/Moscow')
-date_trunc('month', N, 'Europe/Moscow')
-date_trunc('day', N, 'Europe/Moscow')
-date_trunc('minute', N, 'Europe/Moscow')
-toTime(N, 'Europe/Moscow')
-toRelativeYearNum(N, 'Europe/Moscow')
-toRelativeQuarterNum(N, 'Europe/Moscow')
-toRelativeMonthNum(N, 'Europe/Moscow')
-toRelativeWeekNum(N, 'Europe/Moscow')
-toRelativeDayNum(N, 'Europe/Moscow')
-toRelativeHourNum(N, 'Europe/Moscow')
-toRelativeMinuteNum(N, 'Europe/Moscow')
-toRelativeSecondNum(N, 'Europe/Moscow')
-toISOYear(N, 'Europe/Moscow')
-toISOWeek(N, 'Europe/Moscow')
-toWeek(N, 'Europe/Moscow')
-toYearWeek(N, 'Europe/Moscow')
-timeSlot(N, 'Europe/Moscow')
-toYYYYMM(N, 'Europe/Moscow')
-toYYYYMMDD(N, 'Europe/Moscow')
-toYYYYMMDDhhmmss(N, 'Europe/Moscow')
-addYears(N, 1, 'Europe/Moscow')
-addMonths(N, 1, 'Europe/Moscow')
-addWeeks(N, 1, 'Europe/Moscow')
-addDays(N, 1, 'Europe/Moscow')
-addHours(N, 1, 'Europe/Moscow')
-addMinutes(N, 1, 'Europe/Moscow')
-addSeconds(N, 1, 'Europe/Moscow')
-addQuarters(N, 1, 'Europe/Moscow')
-subtractYears(N, 1, 'Europe/Moscow')
-subtractMonths(N, 1, 'Europe/Moscow')
-subtractWeeks(N, 1, 'Europe/Moscow')
-subtractDays(N, 1, 'Europe/Moscow')
-subtractHours(N, 1, 'Europe/Moscow')
-subtractMinutes(N, 1, 'Europe/Moscow')
-subtractSeconds(N, 1, 'Europe/Moscow')
-subtractQuarters(N, 1, 'Europe/Moscow')
+toStartOfYear(N, 'Asia/Istanbul')
+toStartOfISOYear(N, 'Asia/Istanbul')
+toStartOfQuarter(N, 'Asia/Istanbul')
+toStartOfMonth(N, 'Asia/Istanbul')
+toMonday(N, 'Asia/Istanbul')
+toStartOfWeek(N, 'Asia/Istanbul')
+toStartOfDay(N, 'Asia/Istanbul')
+toStartOfHour(N, 'Asia/Istanbul')
+toStartOfMinute(N, 'Asia/Istanbul')
+toStartOfFiveMinutes(N, 'Asia/Istanbul')
+toStartOfTenMinutes(N, 'Asia/Istanbul')
+toStartOfFifteenMinutes(N, 'Asia/Istanbul')
+toStartOfInterval(N, INTERVAL 1 year, 'Asia/Istanbul')
+toStartOfInterval(N, INTERVAL 1 month, 'Asia/Istanbul')
+toStartOfInterval(N, INTERVAL 1 day, 'Asia/Istanbul')
+toStartOfInterval(N, INTERVAL 15 minute, 'Asia/Istanbul')
+date_trunc('year', N, 'Asia/Istanbul')
+date_trunc('month', N, 'Asia/Istanbul')
+date_trunc('day', N, 'Asia/Istanbul')
+date_trunc('minute', N, 'Asia/Istanbul')
+toTime(N, 'Asia/Istanbul')
+toRelativeYearNum(N, 'Asia/Istanbul')
+toRelativeQuarterNum(N, 'Asia/Istanbul')
+toRelativeMonthNum(N, 'Asia/Istanbul')
+toRelativeWeekNum(N, 'Asia/Istanbul')
+toRelativeDayNum(N, 'Asia/Istanbul')
+toRelativeHourNum(N, 'Asia/Istanbul')
+toRelativeMinuteNum(N, 'Asia/Istanbul')
+toRelativeSecondNum(N, 'Asia/Istanbul')
+toISOYear(N, 'Asia/Istanbul')
+toISOWeek(N, 'Asia/Istanbul')
+toWeek(N, 'Asia/Istanbul')
+toYearWeek(N, 'Asia/Istanbul')
+timeSlot(N, 'Asia/Istanbul')
+toYYYYMM(N, 'Asia/Istanbul')
+toYYYYMMDD(N, 'Asia/Istanbul')
+toYYYYMMDDhhmmss(N, 'Asia/Istanbul')
+addYears(N, 1, 'Asia/Istanbul')
+addMonths(N, 1, 'Asia/Istanbul')
+addWeeks(N, 1, 'Asia/Istanbul')
+addDays(N, 1, 'Asia/Istanbul')
+addHours(N, 1, 'Asia/Istanbul')
+addMinutes(N, 1, 'Asia/Istanbul')
+addSeconds(N, 1, 'Asia/Istanbul')
+addQuarters(N, 1, 'Asia/Istanbul')
+subtractYears(N, 1, 'Asia/Istanbul')
+subtractMonths(N, 1, 'Asia/Istanbul')
+subtractWeeks(N, 1, 'Asia/Istanbul')
+subtractDays(N, 1, 'Asia/Istanbul')
+subtractHours(N, 1, 'Asia/Istanbul')
+subtractMinutes(N, 1, 'Asia/Istanbul')
+subtractSeconds(N, 1, 'Asia/Istanbul')
+subtractQuarters(N, 1, 'Asia/Istanbul')
 CAST(N as DateTime('Europe/Minsk'))
 CAST(N as Date)
 CAST(N as UInt64)
@@ -80,10 +80,10 @@ CAST(N as DateTime64(3, 'Europe/Minsk'))
 CAST(N as DateTime64(6, 'Europe/Minsk'))
 CAST(N as DateTime64(9, 'Europe/Minsk'))
 # Casting our test values to DateTime(12) will cause an overflow and hence will fail the test under UB sanitizer.
-# CAST(N as DateTime64(12, 'Europe/Moscow'))
+# CAST(N as DateTime64(12, 'Asia/Istanbul'))
 # DateTime64(18) will always fail due to zero precision, but it is Ok to test here:
-# CAST(N as DateTime64(18, 'Europe/Moscow'))
-formatDateTime(N, '%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%', 'Europe/Moscow')
+# CAST(N as DateTime64(18, 'Asia/Istanbul'))
+formatDateTime(N, '%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%', 'Asia/Istanbul')
 """.splitlines()
 
 # Expanded later to cartesian product of all arguments, using format string.
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
index 6dd1b4b9322..8d28a69ff3d 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
@@ -3,47 +3,47 @@ Code: 43
 "DateTime('UTC')","2019-09-16 16:20:11"
 "DateTime64(3, 'UTC')","2019-09-16 16:20:11.234"
 ------------------------------------------
-SELECT toYear(N, \'Europe/Moscow\')
+SELECT toYear(N, \'Asia/Istanbul\')
 "UInt16",2019
 "UInt16",2019
 "UInt16",2019
 ------------------------------------------
-SELECT toQuarter(N, \'Europe/Moscow\')
+SELECT toQuarter(N, \'Asia/Istanbul\')
 "UInt8",3
 "UInt8",3
 "UInt8",3
 ------------------------------------------
-SELECT toMonth(N, \'Europe/Moscow\')
+SELECT toMonth(N, \'Asia/Istanbul\')
 "UInt8",9
 "UInt8",9
 "UInt8",9
 ------------------------------------------
-SELECT toDayOfYear(N, \'Europe/Moscow\')
+SELECT toDayOfYear(N, \'Asia/Istanbul\')
 "UInt16",259
 "UInt16",259
 "UInt16",259
 ------------------------------------------
-SELECT toDayOfMonth(N, \'Europe/Moscow\')
+SELECT toDayOfMonth(N, \'Asia/Istanbul\')
 "UInt8",16
 "UInt8",16
 "UInt8",16
 ------------------------------------------
-SELECT toDayOfWeek(N, \'Europe/Moscow\')
+SELECT toDayOfWeek(N, \'Asia/Istanbul\')
 "UInt8",1
 "UInt8",1
 "UInt8",1
 ------------------------------------------
-SELECT toHour(N, \'Europe/Moscow\')
+SELECT toHour(N, \'Asia/Istanbul\')
 Code: 43
 "UInt8",19
 "UInt8",19
 ------------------------------------------
-SELECT toMinute(N, \'Europe/Moscow\')
+SELECT toMinute(N, \'Asia/Istanbul\')
 Code: 43
 "UInt8",20
 "UInt8",20
 ------------------------------------------
-SELECT toSecond(N, \'Europe/Moscow\')
+SELECT toSecond(N, \'Asia/Istanbul\')
 Code: 43
 "UInt8",11
 "UInt8",11
@@ -53,269 +53,269 @@ Code: 44
 "UInt32",1568650811
 "UInt32",1568650811
 ------------------------------------------
-SELECT toStartOfYear(N, \'Europe/Moscow\')
+SELECT toStartOfYear(N, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-01-01"
 "Date","2019-01-01"
 ------------------------------------------
-SELECT toStartOfISOYear(N, \'Europe/Moscow\')
+SELECT toStartOfISOYear(N, \'Asia/Istanbul\')
 Code: 43
 "Date","2018-12-31"
 "Date","2018-12-31"
 ------------------------------------------
-SELECT toStartOfQuarter(N, \'Europe/Moscow\')
+SELECT toStartOfQuarter(N, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-07-01"
 "Date","2019-07-01"
 ------------------------------------------
-SELECT toStartOfMonth(N, \'Europe/Moscow\')
+SELECT toStartOfMonth(N, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-09-01"
 "Date","2019-09-01"
 ------------------------------------------
-SELECT toMonday(N, \'Europe/Moscow\')
+SELECT toMonday(N, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-09-16"
 "Date","2019-09-16"
 ------------------------------------------
-SELECT toStartOfWeek(N, \'Europe/Moscow\')
+SELECT toStartOfWeek(N, \'Asia/Istanbul\')
 Code: 43
 Code: 43
 Code: 43
 ------------------------------------------
-SELECT toStartOfDay(N, \'Europe/Moscow\')
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
+SELECT toStartOfDay(N, \'Asia/Istanbul\')
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
 ------------------------------------------
-SELECT toStartOfHour(N, \'Europe/Moscow\')
+SELECT toStartOfHour(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:00:00"
 ------------------------------------------
-SELECT toStartOfMinute(N, \'Europe/Moscow\')
+SELECT toStartOfMinute(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
 ------------------------------------------
-SELECT toStartOfFiveMinutes(N, \'Europe/Moscow\')
+SELECT toStartOfFiveMinutes(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
 ------------------------------------------
-SELECT toStartOfTenMinutes(N, \'Europe/Moscow\')
+SELECT toStartOfTenMinutes(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
 ------------------------------------------
-SELECT toStartOfFifteenMinutes(N, \'Europe/Moscow\')
+SELECT toStartOfFifteenMinutes(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:15:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:15:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:15:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:15:00"
 ------------------------------------------
-SELECT toStartOfInterval(N, INTERVAL 1 year, \'Europe/Moscow\')
+SELECT toStartOfInterval(N, INTERVAL 1 year, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-01-01"
 "Date","2019-01-01"
 ------------------------------------------
-SELECT toStartOfInterval(N, INTERVAL 1 month, \'Europe/Moscow\')
+SELECT toStartOfInterval(N, INTERVAL 1 month, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-09-01"
 "Date","2019-09-01"
 ------------------------------------------
-SELECT toStartOfInterval(N, INTERVAL 1 day, \'Europe/Moscow\')
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
+SELECT toStartOfInterval(N, INTERVAL 1 day, \'Asia/Istanbul\')
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
 ------------------------------------------
-SELECT toStartOfInterval(N, INTERVAL 15 minute, \'Europe/Moscow\')
+SELECT toStartOfInterval(N, INTERVAL 15 minute, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:15:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:15:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:15:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:15:00"
 ------------------------------------------
-SELECT date_trunc(\'year\', N, \'Europe/Moscow\')
+SELECT date_trunc(\'year\', N, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-01-01"
 "Date","2019-01-01"
 ------------------------------------------
-SELECT date_trunc(\'month\', N, \'Europe/Moscow\')
+SELECT date_trunc(\'month\', N, \'Asia/Istanbul\')
 Code: 43
 "Date","2019-09-01"
 "Date","2019-09-01"
 ------------------------------------------
-SELECT date_trunc(\'day\', N, \'Europe/Moscow\')
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 00:00:00"
+SELECT date_trunc(\'day\', N, \'Asia/Istanbul\')
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 00:00:00"
 ------------------------------------------
-SELECT date_trunc(\'minute\', N, \'Europe/Moscow\')
+SELECT date_trunc(\'minute\', N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:00"
 ------------------------------------------
-SELECT toTime(N, \'Europe/Moscow\')
+SELECT toTime(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","1970-01-02 19:20:11"
-"DateTime('Europe/Moscow')","1970-01-02 19:20:11"
+"DateTime('Asia/Istanbul')","1970-01-02 19:20:11"
+"DateTime('Asia/Istanbul')","1970-01-02 19:20:11"
 ------------------------------------------
-SELECT toRelativeYearNum(N, \'Europe/Moscow\')
+SELECT toRelativeYearNum(N, \'Asia/Istanbul\')
 "UInt16",2019
 "UInt16",2019
 "UInt16",2019
 ------------------------------------------
-SELECT toRelativeQuarterNum(N, \'Europe/Moscow\')
+SELECT toRelativeQuarterNum(N, \'Asia/Istanbul\')
 "UInt32",8078
 "UInt32",8078
 "UInt32",8078
 ------------------------------------------
-SELECT toRelativeMonthNum(N, \'Europe/Moscow\')
+SELECT toRelativeMonthNum(N, \'Asia/Istanbul\')
 "UInt32",24237
 "UInt32",24237
 "UInt32",24237
 ------------------------------------------
-SELECT toRelativeWeekNum(N, \'Europe/Moscow\')
+SELECT toRelativeWeekNum(N, \'Asia/Istanbul\')
 "UInt32",2594
 "UInt32",2594
 "UInt32",2594
 ------------------------------------------
-SELECT toRelativeDayNum(N, \'Europe/Moscow\')
+SELECT toRelativeDayNum(N, \'Asia/Istanbul\')
 "UInt32",18155
 "UInt32",18155
 "UInt32",18155
 ------------------------------------------
-SELECT toRelativeHourNum(N, \'Europe/Moscow\')
+SELECT toRelativeHourNum(N, \'Asia/Istanbul\')
 "UInt32",435717
 "UInt32",435736
 "UInt32",435736
 ------------------------------------------
-SELECT toRelativeMinuteNum(N, \'Europe/Moscow\')
+SELECT toRelativeMinuteNum(N, \'Asia/Istanbul\')
 "UInt32",26143020
 "UInt32",26144180
 "UInt32",26144180
 ------------------------------------------
-SELECT toRelativeSecondNum(N, \'Europe/Moscow\')
+SELECT toRelativeSecondNum(N, \'Asia/Istanbul\')
 "UInt32",1568581200
 "UInt32",1568650811
 "UInt32",1568650811
 ------------------------------------------
-SELECT toISOYear(N, \'Europe/Moscow\')
+SELECT toISOYear(N, \'Asia/Istanbul\')
 "UInt16",2019
 "UInt16",2019
 "UInt16",2019
 ------------------------------------------
-SELECT toISOWeek(N, \'Europe/Moscow\')
+SELECT toISOWeek(N, \'Asia/Istanbul\')
 "UInt8",38
 "UInt8",38
 "UInt8",38
 ------------------------------------------
-SELECT toWeek(N, \'Europe/Moscow\')
+SELECT toWeek(N, \'Asia/Istanbul\')
 Code: 43
 Code: 43
 Code: 43
 ------------------------------------------
-SELECT toYearWeek(N, \'Europe/Moscow\')
+SELECT toYearWeek(N, \'Asia/Istanbul\')
 Code: 43
 Code: 43
 Code: 43
 ------------------------------------------
-SELECT timeSlot(N, \'Europe/Moscow\')
+SELECT timeSlot(N, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:00:00"
-"DateTime('Europe/Moscow')","2019-09-16 19:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:00:00"
+"DateTime('Asia/Istanbul')","2019-09-16 19:00:00"
 ------------------------------------------
-SELECT toYYYYMM(N, \'Europe/Moscow\')
+SELECT toYYYYMM(N, \'Asia/Istanbul\')
 "UInt32",201909
 "UInt32",201909
 "UInt32",201909
 ------------------------------------------
-SELECT toYYYYMMDD(N, \'Europe/Moscow\')
+SELECT toYYYYMMDD(N, \'Asia/Istanbul\')
 "UInt32",20190916
 "UInt32",20190916
 "UInt32",20190916
 ------------------------------------------
-SELECT toYYYYMMDDhhmmss(N, \'Europe/Moscow\')
+SELECT toYYYYMMDDhhmmss(N, \'Asia/Istanbul\')
 "UInt64",20190916000000
 "UInt64",20190916192011
 "UInt64",20190916192011
 ------------------------------------------
-SELECT addYears(N, 1, \'Europe/Moscow\')
+SELECT addYears(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2020-09-16 19:20:11"
+"DateTime('Asia/Istanbul')","2020-09-16 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT addMonths(N, 1, \'Europe/Moscow\')
+SELECT addMonths(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-10-16 19:20:11"
+"DateTime('Asia/Istanbul')","2019-10-16 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT addWeeks(N, 1, \'Europe/Moscow\')
+SELECT addWeeks(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-23 19:20:11"
+"DateTime('Asia/Istanbul')","2019-09-23 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT addDays(N, 1, \'Europe/Moscow\')
+SELECT addDays(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-17 19:20:11"
+"DateTime('Asia/Istanbul')","2019-09-17 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT addHours(N, 1, \'Europe/Moscow\')
+SELECT addHours(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 20:20:11"
+"DateTime('Asia/Istanbul')","2019-09-16 20:20:11"
 Code: 43
 ------------------------------------------
-SELECT addMinutes(N, 1, \'Europe/Moscow\')
+SELECT addMinutes(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:21:11"
+"DateTime('Asia/Istanbul')","2019-09-16 19:21:11"
 Code: 43
 ------------------------------------------
-SELECT addSeconds(N, 1, \'Europe/Moscow\')
+SELECT addSeconds(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:20:12"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:12"
 Code: 43
 ------------------------------------------
-SELECT addQuarters(N, 1, \'Europe/Moscow\')
+SELECT addQuarters(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-12-16 19:20:11"
+"DateTime('Asia/Istanbul')","2019-12-16 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT subtractYears(N, 1, \'Europe/Moscow\')
+SELECT subtractYears(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2018-09-16 19:20:11"
+"DateTime('Asia/Istanbul')","2018-09-16 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT subtractMonths(N, 1, \'Europe/Moscow\')
+SELECT subtractMonths(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-08-16 19:20:11"
+"DateTime('Asia/Istanbul')","2019-08-16 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT subtractWeeks(N, 1, \'Europe/Moscow\')
+SELECT subtractWeeks(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-09 19:20:11"
+"DateTime('Asia/Istanbul')","2019-09-09 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT subtractDays(N, 1, \'Europe/Moscow\')
+SELECT subtractDays(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-15 19:20:11"
+"DateTime('Asia/Istanbul')","2019-09-15 19:20:11"
 Code: 43
 ------------------------------------------
-SELECT subtractHours(N, 1, \'Europe/Moscow\')
+SELECT subtractHours(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 18:20:11"
+"DateTime('Asia/Istanbul')","2019-09-16 18:20:11"
 Code: 43
 ------------------------------------------
-SELECT subtractMinutes(N, 1, \'Europe/Moscow\')
+SELECT subtractMinutes(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:19:11"
+"DateTime('Asia/Istanbul')","2019-09-16 19:19:11"
 Code: 43
 ------------------------------------------
-SELECT subtractSeconds(N, 1, \'Europe/Moscow\')
+SELECT subtractSeconds(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-09-16 19:20:10"
+"DateTime('Asia/Istanbul')","2019-09-16 19:20:10"
 Code: 43
 ------------------------------------------
-SELECT subtractQuarters(N, 1, \'Europe/Moscow\')
+SELECT subtractQuarters(N, 1, \'Asia/Istanbul\')
 Code: 43
-"DateTime('Europe/Moscow')","2019-06-16 19:20:11"
+"DateTime('Asia/Istanbul')","2019-06-16 19:20:11"
 Code: 43
 ------------------------------------------
 SELECT CAST(N as DateTime(\'Europe/Minsk\'))
@@ -353,7 +353,7 @@ SELECT CAST(N as DateTime64(9, \'Europe/Minsk\'))
 "DateTime64(9, 'Europe/Minsk')","2019-09-16 19:20:11.000000000"
 "DateTime64(9, 'Europe/Minsk')","2019-09-16 19:20:11.234000000"
 ------------------------------------------
-SELECT formatDateTime(N, \'%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%\', \'Europe/Moscow\')
+SELECT formatDateTime(N, \'%C %d %D %e %F %H %I %j %m %M %p %R %S %T %u %V %w %y %Y %%\', \'Asia/Istanbul\')
 "String","20 16 09/16/19 16 2019-09-16 00 12 259 09 00 AM 00:00 00 00:00:00 1 38 1 19 2019 %"
 "String","20 16 09/16/19 16 2019-09-16 19 07 259 09 20 PM 19:20 11 19:20:11 1 38 1 19 2019 %"
 "String","20 16 09/16/19 16 2019-09-16 19 07 259 09 20 PM 19:20 11 19:20:11 1 38 1 19 2019 %"
diff --git a/tests/queries/0_stateless/00927_asof_join_other_types.reference b/tests/queries/0_stateless/00927_asof_join_other_types.reference
index 83ee534ff91..80c85ec1ae3 100644
--- a/tests/queries/0_stateless/00927_asof_join_other_types.reference
+++ b/tests/queries/0_stateless/00927_asof_join_other_types.reference
@@ -10,9 +10,9 @@
 2	1	1	0
 2	3	3	3
 2	5	5	3
-2	1970-01-01 03:00:01	1	0
-2	1970-01-01 03:00:03	3	3
-2	1970-01-01 03:00:05	5	3
+2	1970-01-01 02:00:01	1	0
+2	1970-01-01 02:00:03	3	3
+2	1970-01-01 02:00:05	5	3
 2	1	1	0
 2	3	3	3
 2	5	5	3
@@ -22,6 +22,6 @@
 2	1	1	0
 2	3	3	3
 2	5	5	3
-2	1970-01-01 03:00:00.001	1	0
-2	1970-01-01 03:00:00.003	3	3
-2	1970-01-01 03:00:00.005	5	3
+2	1970-01-01 02:00:00.001	1	0
+2	1970-01-01 02:00:00.003	3	3
+2	1970-01-01 02:00:00.005	5	3
diff --git a/tests/queries/0_stateless/00927_asof_join_other_types.sh b/tests/queries/0_stateless/00927_asof_join_other_types.sh
index 0c17ca2085f..10173a3e43f 100755
--- a/tests/queries/0_stateless/00927_asof_join_other_types.sh
+++ b/tests/queries/0_stateless/00927_asof_join_other_types.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-for typename in "UInt32" "UInt64" "Float64" "Float32" "DateTime('Europe/Moscow')" "Decimal32(5)" "Decimal64(5)" "Decimal128(5)" "DateTime64(3, 'Europe/Moscow')"
+for typename in "UInt32" "UInt64" "Float64" "Float32" "DateTime('Asia/Istanbul')" "Decimal32(5)" "Decimal64(5)" "Decimal128(5)" "DateTime64(3, 'Asia/Istanbul')"
 do
     $CLICKHOUSE_CLIENT -mn <<EOF
 DROP TABLE IF EXISTS A;
diff --git a/tests/queries/0_stateless/00935_to_iso_week_first_year.sql b/tests/queries/0_stateless/00935_to_iso_week_first_year.sql
index b311596359c..eb1c4135ba4 100644
--- a/tests/queries/0_stateless/00935_to_iso_week_first_year.sql
+++ b/tests/queries/0_stateless/00935_to_iso_week_first_year.sql
@@ -1,3 +1,3 @@
 SELECT toDate('1970-01-01') + number AS d, toISOWeek(d), toISOYear(d) FROM numbers(15);
 -- Note that 1970-01-01 00:00:00 in Moscow is before unix epoch.
-SELECT toDateTime(toDate('1970-01-02') + number, 'Europe/Moscow') AS t, toISOWeek(t), toISOYear(t) FROM numbers(15);
+SELECT toDateTime(toDate('1970-01-02') + number, 'Asia/Istanbul') AS t, toISOWeek(t), toISOYear(t) FROM numbers(15);
diff --git a/tests/queries/0_stateless/00941_system_columns_race_condition.sh b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
index 24f159c7d24..69dfb30cd2c 100755
--- a/tests/queries/0_stateless/00941_system_columns_race_condition.sh
+++ b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
@@ -9,45 +9,40 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -nm -q "
-    DROP TABLE IF EXISTS alter_table;
-    CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = MergeTree ORDER BY a;
-"
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS alter_table"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = MergeTree ORDER BY a"
 
 function thread1()
 {
     # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    $CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns UNION ALL SELECT name FROM system.columns FORMAT Null"
+    while true; do $CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns UNION ALL SELECT name FROM system.columns FORMAT Null"; done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT -n --query "
-        ALTER TABLE alter_table ADD COLUMN h String;
-        ALTER TABLE alter_table MODIFY COLUMN h UInt64;
-        ALTER TABLE alter_table DROP COLUMN h;
-    "
+    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table ADD COLUMN h String; ALTER TABLE alter_table MODIFY COLUMN h UInt64; ALTER TABLE alter_table DROP COLUMN h;"; done
 }
 
-export -f thread1
-export -f thread2
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
 
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread1 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
-clickhouse_client_loop_timeout 15 thread2 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread1 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
+timeout 15 bash -c thread2 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/00941_to_custom_week.sql b/tests/queries/0_stateless/00941_to_custom_week.sql
index c7d52e7438b..4dd5d209306 100644
--- a/tests/queries/0_stateless/00941_to_custom_week.sql
+++ b/tests/queries/0_stateless/00941_to_custom_week.sql
@@ -33,11 +33,11 @@ SELECT
     toYearWeek(d, 9) AS yearWeek9
 FROM numbers(21);
 
-SELECT toDateTime(toDate('2016-12-22') + number, 'Europe/Moscow' ) AS d, 
-    toWeek(d, 8, 'Europe/Moscow') AS week8, 
-    toWeek(d, 9, 'Europe/Moscow') AS week9, 
-    toYearWeek(d, 8, 'Europe/Moscow') AS yearWeek8,
-    toYearWeek(d, 9, 'Europe/Moscow') AS yearWeek9
+SELECT toDateTime(toDate('2016-12-22') + number, 'Asia/Istanbul' ) AS d, 
+    toWeek(d, 8, 'Asia/Istanbul') AS week8, 
+    toWeek(d, 9, 'Asia/Istanbul') AS week9, 
+    toYearWeek(d, 8, 'Asia/Istanbul') AS yearWeek8,
+    toYearWeek(d, 9, 'Asia/Istanbul') AS yearWeek9
 FROM numbers(21);
 
 -- toStartOfWeek
diff --git a/tests/queries/0_stateless/00945_bloom_filter_index.sql b/tests/queries/0_stateless/00945_bloom_filter_index.sql
index 497b0cdb641..fc18a4a4dc5 100644
--- a/tests/queries/0_stateless/00945_bloom_filter_index.sql
+++ b/tests/queries/0_stateless/00945_bloom_filter_index.sql
@@ -28,8 +28,8 @@ DROP TABLE IF EXISTS single_column_bloom_filter;
 
 DROP TABLE IF EXISTS bloom_filter_types_test;
 
-CREATE TABLE bloom_filter_types_test (order_key   UInt64, i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, f32 Float32, f64 Float64, date Date, date_time DateTime('Europe/Moscow'), str String, fixed_string FixedString(5), INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string) TYPE bloom_filter GRANULARITY 1) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 6;
-INSERT INTO bloom_filter_types_test SELECT number AS order_key, toInt8(number) AS i8, toInt16(number) AS i16, toInt32(number) AS i32, toInt64(number) AS i64, toUInt8(number) AS u8, toUInt16(number) AS u16, toUInt32(number) AS u32, toUInt64(number) AS u64, toFloat32(number) AS f32, toFloat64(number) AS f64, toDate(number, 'Europe/Moscow') AS date, toDateTime(number, 'Europe/Moscow') AS date_time, toString(number) AS str, toFixedString(toString(number), 5) AS fixed_string FROM system.numbers LIMIT 100;
+CREATE TABLE bloom_filter_types_test (order_key   UInt64, i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, f32 Float32, f64 Float64, date Date, date_time DateTime('Asia/Istanbul'), str String, fixed_string FixedString(5), INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string) TYPE bloom_filter GRANULARITY 1) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 6;
+INSERT INTO bloom_filter_types_test SELECT number AS order_key, toInt8(number) AS i8, toInt16(number) AS i16, toInt32(number) AS i32, toInt64(number) AS i64, toUInt8(number) AS u8, toUInt16(number) AS u16, toUInt32(number) AS u32, toUInt64(number) AS u64, toFloat32(number) AS f32, toFloat64(number) AS f64, toDate(number, 'Asia/Istanbul') AS date, toDateTime(number, 'Asia/Istanbul') AS date_time, toString(number) AS str, toFixedString(toString(number), 5) AS fixed_string FROM system.numbers LIMIT 100;
 
 SELECT COUNT() FROM bloom_filter_types_test WHERE i8 = 1 SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_types_test WHERE i16 = 1 SETTINGS max_rows_to_read = 6;
@@ -42,7 +42,7 @@ SELECT COUNT() FROM bloom_filter_types_test WHERE u64 = 1 SETTINGS max_rows_to_r
 SELECT COUNT() FROM bloom_filter_types_test WHERE f32 = 1 SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_types_test WHERE f64 = 1 SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_types_test WHERE date = '1970-01-02' SETTINGS max_rows_to_read = 6;
-SELECT COUNT() FROM bloom_filter_types_test WHERE date_time = toDateTime('1970-01-01 03:00:01', 'Europe/Moscow') SETTINGS max_rows_to_read = 6;
+SELECT COUNT() FROM bloom_filter_types_test WHERE date_time = toDateTime('1970-01-01 02:00:01', 'Asia/Istanbul') SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_types_test WHERE str = '1' SETTINGS max_rows_to_read = 12;
 SELECT COUNT() FROM bloom_filter_types_test WHERE fixed_string = toFixedString('1', 5) SETTINGS max_rows_to_read = 12;
 
@@ -52,10 +52,10 @@ DROP TABLE IF EXISTS bloom_filter_types_test;
 
 DROP TABLE IF EXISTS bloom_filter_array_types_test;
 
-CREATE TABLE bloom_filter_array_types_test (order_key   Array(UInt64), i8 Array(Int8), i16 Array(Int16), i32 Array(Int32), i64 Array(Int64), u8 Array(UInt8), u16 Array(UInt16), u32 Array(UInt32), u64 Array(UInt64), f32 Array(Float32), f64 Array(Float64), date Array(Date), date_time Array(DateTime('Europe/Moscow')), str Array(String), fixed_string Array(FixedString(5)), INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string) TYPE bloom_filter GRANULARITY 1) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 6;
-INSERT INTO bloom_filter_array_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Europe/Moscow')) AS date, groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers LIMIT 15);
-INSERT INTO bloom_filter_array_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Europe/Moscow')) AS date, groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 5 LIMIT 15);
-INSERT INTO bloom_filter_array_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Europe/Moscow')) AS date, groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 10 LIMIT 15);
+CREATE TABLE bloom_filter_array_types_test (order_key   Array(UInt64), i8 Array(Int8), i16 Array(Int16), i32 Array(Int32), i64 Array(Int64), u8 Array(UInt8), u16 Array(UInt16), u32 Array(UInt32), u64 Array(UInt64), f32 Array(Float32), f64 Array(Float64), date Array(Date), date_time Array(DateTime('Asia/Istanbul')), str Array(String), fixed_string Array(FixedString(5)), INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string) TYPE bloom_filter GRANULARITY 1) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 6;
+INSERT INTO bloom_filter_array_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Asia/Istanbul')) AS date, groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers LIMIT 15);
+INSERT INTO bloom_filter_array_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Asia/Istanbul')) AS date, groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 5 LIMIT 15);
+INSERT INTO bloom_filter_array_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Asia/Istanbul')) AS date, groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 10 LIMIT 15);
 
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(i8, 1);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(i16, 1);
@@ -68,7 +68,7 @@ SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(u64, 1);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(f32, 1);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(f64, 1);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date, toDate('1970-01-02'));
-SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date_time, toDateTime('1970-01-01 03:00:01', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date_time, toDateTime('1970-01-01 02:00:01', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(str, '1');
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(fixed_string, toFixedString('1', 5));
 
@@ -83,7 +83,7 @@ SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(u64, 5);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(f32, 5);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(f64, 5);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date, toDate('1970-01-06'));
-SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date_time, toDateTime('1970-01-01 03:00:05', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date_time, toDateTime('1970-01-01 02:00:05', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(str, '5');
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(fixed_string, toFixedString('5', 5));
 
@@ -98,7 +98,7 @@ SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(u64, 10);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(f32, 10);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(f64, 10);
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date, toDate('1970-01-11'));
-SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date_time, toDateTime('1970-01-01 03:00:10', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(date_time, toDateTime('1970-01-01 02:00:10', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(str, '10');
 SELECT COUNT() FROM bloom_filter_array_types_test WHERE has(fixed_string, toFixedString('10', 5));
 
@@ -106,8 +106,8 @@ DROP TABLE IF EXISTS bloom_filter_array_types_test;
 
 DROP TABLE IF EXISTS bloom_filter_null_types_test;
 
-CREATE TABLE bloom_filter_null_types_test (order_key UInt64, i8 Nullable(Int8), i16 Nullable(Int16), i32 Nullable(Int32), i64 Nullable(Int64), u8 Nullable(UInt8), u16 Nullable(UInt16), u32 Nullable(UInt32), u64 Nullable(UInt64), f32 Nullable(Float32), f64 Nullable(Float64), date Nullable(Date), date_time Nullable(DateTime('Europe/Moscow')), str Nullable(String), fixed_string Nullable(FixedString(5)), INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string) TYPE bloom_filter GRANULARITY 1) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 6;
-INSERT INTO bloom_filter_null_types_test SELECT number AS order_key, toInt8(number) AS i8, toInt16(number) AS i16, toInt32(number) AS i32, toInt64(number) AS i64, toUInt8(number) AS u8, toUInt16(number) AS u16, toUInt32(number) AS u32, toUInt64(number) AS u64, toFloat32(number) AS f32, toFloat64(number) AS f64, toDate(number, 'Europe/Moscow') AS date, toDateTime(number, 'Europe/Moscow') AS date_time, toString(number) AS str, toFixedString(toString(number), 5) AS fixed_string FROM system.numbers LIMIT 100;
+CREATE TABLE bloom_filter_null_types_test (order_key UInt64, i8 Nullable(Int8), i16 Nullable(Int16), i32 Nullable(Int32), i64 Nullable(Int64), u8 Nullable(UInt8), u16 Nullable(UInt16), u32 Nullable(UInt32), u64 Nullable(UInt64), f32 Nullable(Float32), f64 Nullable(Float64), date Nullable(Date), date_time Nullable(DateTime('Asia/Istanbul')), str Nullable(String), fixed_string Nullable(FixedString(5)), INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string) TYPE bloom_filter GRANULARITY 1) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 6;
+INSERT INTO bloom_filter_null_types_test SELECT number AS order_key, toInt8(number) AS i8, toInt16(number) AS i16, toInt32(number) AS i32, toInt64(number) AS i64, toUInt8(number) AS u8, toUInt16(number) AS u16, toUInt32(number) AS u32, toUInt64(number) AS u64, toFloat32(number) AS f32, toFloat64(number) AS f64, toDate(number, 'Asia/Istanbul') AS date, toDateTime(number, 'Asia/Istanbul') AS date_time, toString(number) AS str, toFixedString(toString(number), 5) AS fixed_string FROM system.numbers LIMIT 100;
 INSERT INTO bloom_filter_null_types_test SELECT 0 AS order_key, NULL AS i8, NULL AS i16, NULL AS i32, NULL AS i64, NULL AS u8, NULL AS u16, NULL AS u32, NULL AS u64, NULL AS f32, NULL AS f64, NULL AS date, NULL AS date_time, NULL AS str, NULL AS fixed_string;
 
 SELECT COUNT() FROM bloom_filter_null_types_test WHERE i8 = 1 SETTINGS max_rows_to_read = 6;
@@ -121,7 +121,7 @@ SELECT COUNT() FROM bloom_filter_null_types_test WHERE u64 = 1 SETTINGS max_rows
 SELECT COUNT() FROM bloom_filter_null_types_test WHERE f32 = 1 SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_null_types_test WHERE f64 = 1 SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_null_types_test WHERE date = '1970-01-02' SETTINGS max_rows_to_read = 6;
-SELECT COUNT() FROM bloom_filter_null_types_test WHERE date_time = toDateTime('1970-01-01 03:00:01', 'Europe/Moscow') SETTINGS max_rows_to_read = 6;
+SELECT COUNT() FROM bloom_filter_null_types_test WHERE date_time = toDateTime('1970-01-01 02:00:01', 'Asia/Istanbul') SETTINGS max_rows_to_read = 6;
 SELECT COUNT() FROM bloom_filter_null_types_test WHERE str = '1' SETTINGS max_rows_to_read = 12;
 SELECT COUNT() FROM bloom_filter_null_types_test WHERE fixed_string = toFixedString('1', 5) SETTINGS max_rows_to_read = 12;
 
@@ -177,7 +177,7 @@ CREATE TABLE bloom_filter_array_lc_null_types_test (
     f64 Array(LowCardinality(Nullable(Float64))),
 
     date Array(LowCardinality(Nullable(Date))),
-    date_time Array(LowCardinality(Nullable(DateTime('Europe/Moscow')))),
+    date_time Array(LowCardinality(Nullable(DateTime('Asia/Istanbul')))),
 
     str Array(LowCardinality(Nullable(String))),
     fixed_string Array(LowCardinality(Nullable(FixedString(5)))),
@@ -197,16 +197,16 @@ SELECT groupArray(number) AS order_key,
     groupArray(toUInt64(number)) AS u64,
     groupArray(toFloat32(number)) AS f32,
     groupArray(toFloat64(number)) AS f64,
-    groupArray(toDate(number, 'Europe/Moscow')) AS date,
-    groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time,
+    groupArray(toDate(number, 'Asia/Istanbul')) AS date,
+    groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time,
     groupArray(toString(number)) AS str,
     groupArray(toFixedString(toString(number), 5)) AS fixed_string
     FROM (SELECT number FROM system.numbers LIMIT 15);
 
-INSERT INTO bloom_filter_array_lc_null_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Europe/Moscow')) AS date, groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 5 LIMIT 15);
-INSERT INTO bloom_filter_array_lc_null_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Europe/Moscow')) AS date, groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 10 LIMIT 15);
+INSERT INTO bloom_filter_array_lc_null_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Asia/Istanbul')) AS date, groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 5 LIMIT 15);
+INSERT INTO bloom_filter_array_lc_null_types_test SELECT groupArray(number) AS order_key, groupArray(toInt8(number)) AS i8, groupArray(toInt16(number)) AS i16, groupArray(toInt32(number)) AS i32, groupArray(toInt64(number)) AS i64, groupArray(toUInt8(number)) AS u8, groupArray(toUInt16(number)) AS u16, groupArray(toUInt32(number)) AS u32, groupArray(toUInt64(number)) AS u64, groupArray(toFloat32(number)) AS f32, groupArray(toFloat64(number)) AS f64, groupArray(toDate(number, 'Asia/Istanbul')) AS date, groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time, groupArray(toString(number)) AS str, groupArray(toFixedString(toString(number), 5)) AS fixed_string FROM (SELECT number FROM system.numbers WHERE number >= 10 LIMIT 15);
 INSERT INTO bloom_filter_array_lc_null_types_test SELECT n AS order_key, n AS i8, n AS i16, n AS i32, n AS i64, n AS u8, n AS u16, n AS u32, n AS u64, n AS f32, n AS f64, n AS date, n AS date_time, n AS str, n AS fixed_string FROM (SELECT [NULL] AS n);
-INSERT INTO bloom_filter_array_lc_null_types_test SELECT [NULL, n] AS order_key, [NULL, toInt8(n)] AS i8, [NULL, toInt16(n)] AS i16, [NULL, toInt32(n)] AS i32, [NULL, toInt64(n)] AS i64, [NULL, toUInt8(n)] AS u8, [NULL, toUInt16(n)] AS u16, [NULL, toUInt32(n)] AS u32, [NULL, toUInt64(n)] AS u64, [NULL, toFloat32(n)] AS f32, [NULL, toFloat64(n)] AS f64, [NULL, toDate(n, 'Europe/Moscow')] AS date, [NULL, toDateTime(n, 'Europe/Moscow')] AS date_time, [NULL, toString(n)] AS str, [NULL, toFixedString(toString(n), 5)] AS fixed_string FROM (SELECT 100 as n);
+INSERT INTO bloom_filter_array_lc_null_types_test SELECT [NULL, n] AS order_key, [NULL, toInt8(n)] AS i8, [NULL, toInt16(n)] AS i16, [NULL, toInt32(n)] AS i32, [NULL, toInt64(n)] AS i64, [NULL, toUInt8(n)] AS u8, [NULL, toUInt16(n)] AS u16, [NULL, toUInt32(n)] AS u32, [NULL, toUInt64(n)] AS u64, [NULL, toFloat32(n)] AS f32, [NULL, toFloat64(n)] AS f64, [NULL, toDate(n, 'Asia/Istanbul')] AS date, [NULL, toDateTime(n, 'Asia/Istanbul')] AS date_time, [NULL, toString(n)] AS str, [NULL, toFixedString(toString(n), 5)] AS fixed_string FROM (SELECT 100 as n);
 
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(i8, 1);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(i16, 1);
@@ -219,7 +219,7 @@ SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(u64, 1);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f32, 1);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f64, 1);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date, toDate('1970-01-02'));
-SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 03:00:01', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 02:00:01', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(str, '1');
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(fixed_string, toFixedString('1', 5));
 
@@ -234,7 +234,7 @@ SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(u64, 5);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f32, 5);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f64, 5);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date, toDate('1970-01-06'));
-SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 03:00:05', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 02:00:05', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(str, '5');
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(fixed_string, toFixedString('5', 5));
 
@@ -249,7 +249,7 @@ SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(u64, 10);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f32, 10);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f64, 10);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date, toDate('1970-01-11'));
-SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 03:00:10', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 02:00:10', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(str, '10');
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(fixed_string, toFixedString('10', 5));
 
@@ -279,7 +279,7 @@ SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(u64, 100);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f32, 100);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(f64, 100);
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date, toDate('1970-04-11'));
-SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 03:01:40', 'Europe/Moscow'));
+SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(date_time, toDateTime('1970-01-01 02:01:40', 'Asia/Istanbul'));
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(str, '100');
 SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(fixed_string, toFixedString('100', 5));
 
diff --git a/tests/queries/0_stateless/00948_values_interpreter_template.sql b/tests/queries/0_stateless/00948_values_interpreter_template.sql
index 2404c99f736..a3d2ffd7452 100644
--- a/tests/queries/0_stateless/00948_values_interpreter_template.sql
+++ b/tests/queries/0_stateless/00948_values_interpreter_template.sql
@@ -21,7 +21,7 @@ INSERT INTO type_names VALUES (1, toTypeName([1, 2]), toTypeName((256, -1, 3.14,
 -- _NUM_5: Float64 -> Int64
 INSERT INTO values_template VALUES ((1), lower(replaceAll('Hella', 'a', 'o')), 1 + 2 + 3, round(-4 * 5.0), nan / CAST('42', 'Int8'), reverse([1, 2, 3])), ((2), lower(replaceAll('Warld', 'a', 'o')), -4 + 5 + 6, round(18446744073709551615 * 1e-19), 1.0 / CAST('0', 'Int8'), reverse([])), ((3), lower(replaceAll('Test', 'a', 'o')), 3 + 2 + 1, round(9223372036854775807 * -1), 6.28  / CAST('2', 'Int8'), reverse([4, 5])), ((4), lower(replaceAll('Expressians', 'a', 'o')), 6 + 5 + 4, round(1 * -9223372036854775807), 127.0 / CAST('127', 'Int8'), reverse([6, 7, 8, 9, 0]));
 
-INSERT INTO values_template_nullable VALUES ((1), lower(replaceAll('Hella', 'a', 'o')), 1 + 2 + 3, arraySort(x -> assumeNotNull(x), [null, NULL])),   ((2), lower(replaceAll('Warld', 'b', 'o')), 4 - 5 + 6, arraySort(x -> assumeNotNull(x), [+1, -1, Null])),   ((3), lower(replaceAll('Test', 'c', 'o')), 3 + 2 - 1, arraySort(x -> assumeNotNull(x), [1, nUlL, 3.14])),   ((4), lower(replaceAll(null, 'c', 'o')), 6 + 5 - null, arraySort(x -> assumeNotNull(x), [3, 2, 1]));
+INSERT INTO values_template_nullable VALUES ((1), lower(replaceAll('Hella', 'a', 'o')), 1 + 2 + 3, arraySort(x -> assumeNotNull(x), [null, NULL::Nullable(UInt8)])),   ((2), lower(replaceAll('Warld', 'b', 'o')), 4 - 5 + 6, arraySort(x -> assumeNotNull(x), [+1, -1, Null])),   ((3), lower(replaceAll('Test', 'c', 'o')), 3 + 2 - 1, arraySort(x -> assumeNotNull(x), [1, nUlL, 3.14])),   ((4), lower(replaceAll(null, 'c', 'o')), 6 + 5 - null, arraySort(x -> assumeNotNull(x), [3, 2, 1]));
 
 INSERT INTO values_template_fallback VALUES (1 + x); -- { clientError 62 }
 INSERT INTO values_template_fallback VALUES (abs(functionThatDoesNotExists(42))); -- { clientError 46 }
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
index 731e96b055e..8243c6bde62 100755
--- a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
+++ b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: race, long
+# Tags: race
 
 # This test is disabled because it triggers internal assert in Thread Sanitizer.
 # Thread Sanitizer does not support for more than 64 mutexes to be locked in a single thread.
@@ -11,68 +11,67 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -nm -q "
-    DROP TABLE IF EXISTS alter_table;
-    CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = MergeTree ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1;
-"
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS alter_table"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = MergeTree ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1"
 
 function thread1()
 {
     # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"
+    while true; do $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"; done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table ADD COLUMN h String '0'; ALTER TABLE alter_table MODIFY COLUMN h UInt64; ALTER TABLE alter_table DROP COLUMN h;"
+    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table ADD COLUMN h String '0'; ALTER TABLE alter_table MODIFY COLUMN h UInt64; ALTER TABLE alter_table DROP COLUMN h;"; done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"
+    while true; do $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"; done
 }
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table FINAL"
+    while true; do $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table FINAL"; done
 }
 
 function thread5()
 {
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table DELETE WHERE rand() % 2 = 1"
+    while true; do $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table DELETE WHERE rand() % 2 = 1"; done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
-export -f thread5
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
+export -f thread5;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
 
 wait
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index 3cd61c9972a..8dbd10fc27b 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -9,95 +9,76 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -mn -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP TABLE IF EXISTS alter_table0;
     DROP TABLE IF EXISTS alter_table1;
 
-    CREATE TABLE alter_table0 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16))
-    ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1')
-    ORDER BY a
-    PARTITION BY b % 10
-    SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
-
-    CREATE TABLE alter_table1 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16))
-    ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2')
-    ORDER BY a
-    PARTITION BY b % 10
-    SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
+    CREATE TABLE alter_table0 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
+    CREATE TABLE alter_table1 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0
 "
 
 function thread1()
 {
     # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"
+    while true; do $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"; done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT -nm --query "
-        ALTER TABLE alter_table0 ADD COLUMN h String DEFAULT '0';
-        ALTER TABLE alter_table0 MODIFY COLUMN h UInt64;
-        ALTER TABLE alter_table0 DROP COLUMN h;
-    "
+    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table0 ADD COLUMN h String DEFAULT '0'; ALTER TABLE alter_table0 MODIFY COLUMN h UInt64; ALTER TABLE alter_table0 DROP COLUMN h;"; done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT -q "
-        INSERT INTO alter_table0
-        SELECT
-            rand(1), rand(2), 1 / rand(3), toString(rand(4)),
-            [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(),
-            (rand(8), rand(9))
-        FROM numbers(100000)"
+    while true; do $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table0 SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"; done
 }
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table0 FINAL"
+    while true; do $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table0 FINAL"; done
 }
 
 function thread5()
 {
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table0 DELETE WHERE cityHash64(a,b,c,d,e,g) % 1048576 < 524288"
+    while true; do $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table0 DELETE WHERE cityHash64(a,b,c,d,e,g) % 1048576 < 524288"; done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
-export -f thread5
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
+export -f thread5;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
 wait
 check_replication_consistency "alter_table" "count(), sum(a), sum(b), round(sum(c))"
 
 $CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table0;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
 $CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table1;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
-
 wait
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index 3fe7b0443eb..d5d43d3c293 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -12,87 +12,93 @@ set -e
 function thread1()
 {
     # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null";
+    done
 }
 
 function thread2()
 {
-    REPLICA=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table_$REPLICA ADD COLUMN h String '0'; ALTER TABLE alter_table_$REPLICA MODIFY COLUMN h UInt64; ALTER TABLE alter_table_$REPLICA DROP COLUMN h;"
+    while true; do
+        REPLICA=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table_$REPLICA ADD COLUMN h String '0'; ALTER TABLE alter_table_$REPLICA MODIFY COLUMN h UInt64; ALTER TABLE alter_table_$REPLICA DROP COLUMN h;"; 
+    done
 }
 
 function thread3()
 {
-    REPLICA=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table_$REPLICA SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"
+    while true; do
+        REPLICA=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table_$REPLICA SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"; 
+    done
 }
 
 function thread4()
 {
-    REPLICA=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table_$REPLICA FINAL"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table_$REPLICA FINAL"; 
+        sleep 0.$RANDOM;
+    done
 }
 
 function thread5()
 {
-    REPLICA=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table_$REPLICA DELETE WHERE cityHash64(a,b,c,d,e,g) % 1048576 < 524288"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table_$REPLICA DELETE WHERE cityHash64(a,b,c,d,e,g) % 1048576 < 524288";
+        sleep 0.$RANDOM;
+    done
 }
 
 function thread6()
 {
-    REPLICA=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -mn -q "
-        DROP TABLE IF EXISTS alter_table_$REPLICA;
-
-        CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16))
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA')
-        ORDER BY a
-        PARTITION BY b % 10
-        SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;
-    "
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS alter_table_$REPLICA;
+            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+        sleep 0.$RANDOM;
+        done
 }
 
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
-export -f thread5
-export -f thread6
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
+export -f thread5;
+export -f thread6;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2>&1 | grep "was not completely removed from ZooKeeper" &
 
 wait
 
diff --git a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
index 9b5f92628f7..253d06c038c 100755
--- a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
+++ b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: race, long
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -7,32 +7,35 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test1"
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test2"
-$CLICKHOUSE_CLIENT --query "CREATE TABLE test1 (x UInt64) ENGINE = Memory"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test1";
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test2";
+$CLICKHOUSE_CLIENT --query "CREATE TABLE test1 (x UInt64) ENGINE = Memory";
 
 
 function thread1()
 {
-    seq 1 1000 | {
-        sed -r -e 's/.+/RENAME TABLE test1 TO test2; RENAME TABLE test2 TO test1;/'
-    } | $CLICKHOUSE_CLIENT -n
+    while true; do
+        seq 1 1000 | sed -r -e 's/.+/RENAME TABLE test1 TO test2; RENAME TABLE test2 TO test1;/' | $CLICKHOUSE_CLIENT -n
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM merge('$CLICKHOUSE_DATABASE', '^test[12]$')"
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM merge('$CLICKHOUSE_DATABASE', '^test[12]$')"
+    done
 }
 
-export -f thread1
-export -f thread2
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
 
 wait
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test1"
-$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test2"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test1";
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test2";
diff --git a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
index ee38cf4eb7e..b29a42a7356 100755
--- a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
+++ b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
@@ -12,39 +12,48 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test (x UInt8, s String MATERIALIZED to
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT --query "INSERT INTO test SELECT rand() FROM numbers(1000)"
+    while true; do 
+        $CLICKHOUSE_CLIENT --query "INSERT INTO test SELECT rand() FROM numbers(1000)";
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT -n --query "ALTER TABLE test MODIFY COLUMN x Nullable(UInt8);"
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT -n --query "ALTER TABLE test MODIFY COLUMN x UInt8;"
-    sleep 0.0$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT -n --query "ALTER TABLE test MODIFY COLUMN x Nullable(UInt8);";
+        sleep 0.0$RANDOM
+        $CLICKHOUSE_CLIENT -n --query "ALTER TABLE test MODIFY COLUMN x UInt8;";
+        sleep 0.0$RANDOM
+    done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT -n --query "SELECT count() FROM test FORMAT Null"
+    while true; do
+        $CLICKHOUSE_CLIENT -n --query "SELECT count() FROM test FORMAT Null";
+    done
 }
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT -n --query "OPTIMIZE TABLE test FINAL"
-    sleep 0.1$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT -n --query "OPTIMIZE TABLE test FINAL";
+        sleep 0.1$RANDOM
+    done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01003_kill_query_race_condition.sh b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
index f98897b1544..b71a5106383 100755
--- a/tests/queries/0_stateless/01003_kill_query_race_condition.sh
+++ b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
@@ -9,37 +9,44 @@ set -e
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT --query_id=hello_01003 --query "SELECT count() FROM numbers(1000000000)" --format Null;
+    while true; do 
+        $CLICKHOUSE_CLIENT --query_id=hello_01003 --query "SELECT count() FROM numbers(1000000000)" --format Null;
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id = 'hello_01003'" --format Null
-    sleep 0.$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id = 'hello_01003'" --format Null;
+        sleep 0.$RANDOM
+    done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT --query "SHOW PROCESSLIST" --format Null
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.processes" --format Null
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SHOW PROCESSLIST" --format Null;
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM system.processes" --format Null;
+    done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
 wait
diff --git a/tests/queries/0_stateless/01004_rename_deadlock.sh b/tests/queries/0_stateless/01004_rename_deadlock.sh
index 4a3f23883c0..f0adf136e94 100755
--- a/tests/queries/0_stateless/01004_rename_deadlock.sh
+++ b/tests/queries/0_stateless/01004_rename_deadlock.sh
@@ -14,41 +14,48 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test2 (x UInt8) ENGINE = MergeTree ORDE
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT --query "RENAME TABLE test1 TO test_tmp, test2 TO test1, test_tmp TO test2"
+    while true; do 
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test1 TO test_tmp, test2 TO test1, test_tmp TO test2"
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM test1 UNION ALL SELECT * FROM test2" --format Null
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM test1 UNION ALL SELECT * FROM test2" --format Null
+    done
 }
 
 function thread3()
 {
-    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.tables" --format Null
+    while true; do
+        # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM system.tables" --format Null
+    done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
 wait
 sleep 1
diff --git a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
index 948032f19e7..ef352606b69 100755
--- a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
+++ b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
@@ -12,31 +12,36 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test1 (x UInt8) ENGINE = MergeTree ORDE
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE test1 MODIFY COLUMN x Nullable(UInt8)"
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE test1 MODIFY COLUMN x UInt8"
+    while true; do
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE test1 MODIFY COLUMN x Nullable(UInt8)"
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE test1 MODIFY COLUMN x UInt8"
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT x FROM test1 WHERE x IN (SELECT x FROM remote('127.0.0.2', '$CLICKHOUSE_DATABASE', test1))" --format Null
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT x FROM test1 WHERE x IN (SELECT x FROM remote('127.0.0.2', '$CLICKHOUSE_DATABASE', test1))" --format Null
+    done
 }
 
-export -f thread1
-export -f thread2
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
index 7fa5f5456a2..9f4b2241732 100755
--- a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
+++ b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: deadlock, long
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -16,39 +16,48 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE b (x UInt8) ENGINE = MergeTree ORDER BY
 
 function thread1()
 {
-    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    seq 1 100 | awk '{ print "SELECT x FROM a WHERE x IN (SELECT toUInt8(count()) FROM system.tables);" }' | $CLICKHOUSE_CLIENT -n
+    while true; do
+        # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
+        seq 1 100 | awk '{ print "SELECT x FROM a WHERE x IN (SELECT toUInt8(count()) FROM system.tables);" }' | $CLICKHOUSE_CLIENT -n
+    done
 }
 
 function thread2()
 {
-    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
-    seq 1 100 | awk '{ print "SELECT x FROM b WHERE x IN (SELECT toUInt8(count()) FROM system.tables);" }' | $CLICKHOUSE_CLIENT -n
+    while true; do
+        # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
+        seq 1 100 | awk '{ print "SELECT x FROM b WHERE x IN (SELECT toUInt8(count()) FROM system.tables);" }' | $CLICKHOUSE_CLIENT -n
+    done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE a MODIFY COLUMN x Nullable(UInt8)"
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE a MODIFY COLUMN x UInt8"
+    while true; do 
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE a MODIFY COLUMN x Nullable(UInt8)"
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE a MODIFY COLUMN x UInt8"
+    done
 }
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE b MODIFY COLUMN x Nullable(UInt8)"
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE b MODIFY COLUMN x UInt8"
+    while true; do 
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE b MODIFY COLUMN x Nullable(UInt8)"
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE b MODIFY COLUMN x UInt8"
+    done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
index 290708ccde4..55bbfb3ff11 100755
--- a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+++ b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
@@ -19,7 +19,7 @@ ${CLICKHOUSE_CLIENT} -n -q "
     INSERT INTO $R1 VALUES (1)
 "
 
-clickhouse_client_timeout 10s ${CLICKHOUSE_CLIENT} --receive_timeout 1 -n -q "
+timeout 10s ${CLICKHOUSE_CLIENT} -n -q "
     SET receive_timeout=1;
     SYSTEM SYNC REPLICA $R2
 " 2>&1 | grep -F -q "Code: 159. DB::Exception" && echo 'OK' || echo 'Failed!'
diff --git a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
index d1953dbfd0f..0a6888a5c69 100755
--- a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
@@ -7,67 +7,95 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 export CURR_DATABASE="test_lazy_01014_concurrent_${CLICKHOUSE_DATABASE}"
 
+
 function recreate_lazy_func1()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        DETACH TABLE $CURR_DATABASE.log;
-        ATTACH TABLE $CURR_DATABASE.log;
-    "
+    $CLICKHOUSE_CLIENT -q "
+        CREATE TABLE $CURR_DATABASE.log (a UInt64, b UInt64) ENGINE = Log;
+    ";
+
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            DETACH TABLE $CURR_DATABASE.log;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            ATTACH TABLE $CURR_DATABASE.log;
+        ";
+        done
 }
 
 function recreate_lazy_func2()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        CREATE TABLE $CURR_DATABASE.tlog (a UInt64, b UInt64) ENGINE = TinyLog;
-        DROP TABLE $CURR_DATABASE.tlog;
-    "
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            CREATE TABLE $CURR_DATABASE.tlog (a UInt64, b UInt64) ENGINE = TinyLog;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            DROP TABLE $CURR_DATABASE.tlog;
+        ";
+        done
 }
 
 function recreate_lazy_func3()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        ATTACH TABLE $CURR_DATABASE.slog;
-        DETACH TABLE $CURR_DATABASE.slog;
-    "
+    $CLICKHOUSE_CLIENT -q "
+        CREATE TABLE $CURR_DATABASE.slog (a UInt64, b UInt64) ENGINE = StripeLog;
+    ";
+
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            ATTACH TABLE $CURR_DATABASE.slog;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            DETACH TABLE $CURR_DATABASE.slog;
+        ";
+        done
 }
 
 function recreate_lazy_func4()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        CREATE TABLE $CURR_DATABASE.tlog2 (a UInt64, b UInt64) ENGINE = TinyLog;
-        DROP TABLE $CURR_DATABASE.tlog2;
-    "
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            CREATE TABLE $CURR_DATABASE.tlog2 (a UInt64, b UInt64) ENGINE = TinyLog;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            DROP TABLE $CURR_DATABASE.tlog2;
+        ";
+        done
 }
 
 function show_tables_func()
 {
-    $CLICKHOUSE_CLIENT -q "SELECT * FROM system.tables WHERE database = '$CURR_DATABASE' FORMAT Null"
+    while true; do
+        $CLICKHOUSE_CLIENT -q "SELECT * FROM system.tables WHERE database = '$CURR_DATABASE' FORMAT Null";
+        done
 }
 
 
-export -f recreate_lazy_func1
-export -f recreate_lazy_func2
-export -f recreate_lazy_func3
-export -f recreate_lazy_func4
-export -f show_tables_func
+export -f recreate_lazy_func1;
+export -f recreate_lazy_func2;
+export -f recreate_lazy_func3;
+export -f recreate_lazy_func4;
+export -f show_tables_func;
 
 
 ${CLICKHOUSE_CLIENT} -n -q "
     DROP DATABASE IF EXISTS $CURR_DATABASE;
     CREATE DATABASE $CURR_DATABASE ENGINE = Lazy(1);
-
-    CREATE TABLE $CURR_DATABASE.log (a UInt64, b UInt64) ENGINE = Log;
-    CREATE TABLE $CURR_DATABASE.slog (a UInt64, b UInt64) ENGINE = StripeLog;
 "
 
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT show_tables_func 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func1 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func2 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func3 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func4 2> /dev/null &
+timeout $TIMEOUT bash -c show_tables_func 2> /dev/null &
 
 wait
 sleep 1
@@ -80,3 +108,4 @@ ${CLICKHOUSE_CLIENT} -q "ATTACH TABLE $CURR_DATABASE.tlog2;" 2>/dev/null
 ${CLICKHOUSE_CLIENT} -q "DROP DATABASE $CURR_DATABASE"
 
 echo "Test OK"
+
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
index e98fb57c2a4..872b0a7c1a1 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT -mn -q "
+$CLICKHOUSE_CLIENT -n -q "
     DROP DATABASE IF EXISTS database_for_dict;
     DROP TABLE IF EXISTS table_for_dict1;
     DROP TABLE IF EXISTS table_for_dict2;
@@ -20,104 +20,96 @@ $CLICKHOUSE_CLIENT -mn -q "
 
     CREATE DATABASE database_for_dict;
 
-    CREATE DICTIONARY database_for_dict.dict1 (key_column UInt64, value_column String)
-    PRIMARY KEY key_column
-    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict1' PASSWORD '' DB '$CLICKHOUSE_DATABASE'))
-    LIFETIME(MIN 1 MAX 5)
-    LAYOUT(FLAT());
+    CREATE DICTIONARY database_for_dict.dict1 (key_column UInt64, value_column String) PRIMARY KEY key_column SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict1' PASSWORD '' DB '$CLICKHOUSE_DATABASE')) LIFETIME(MIN 1 MAX 5) LAYOUT(FLAT());
 
-    CREATE DICTIONARY database_for_dict.dict2 (key_column UInt64, value_column String)
-    PRIMARY KEY key_column
-    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict2' PASSWORD '' DB '$CLICKHOUSE_DATABASE'))
-    LIFETIME(MIN 1 MAX 5)
-    LAYOUT(CACHE(SIZE_IN_CELLS 150));
+    CREATE DICTIONARY database_for_dict.dict2 (key_column UInt64, value_column String) PRIMARY KEY key_column SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict2' PASSWORD '' DB '$CLICKHOUSE_DATABASE')) LIFETIME(MIN 1 MAX 5) LAYOUT(CACHE(SIZE_IN_CELLS 150));
 "
 
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.dictionaries FORMAT Null"
+    while true; do $CLICKHOUSE_CLIENT --query "SELECT * FROM system.dictionaries FORMAT Null"; done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "ATTACH DICTIONARY database_for_dict.dict1" ||:
+    while true; do CLICKHOUSE_CLIENT --query "ATTACH DICTIONARY database_for_dict.dict1" ||: ; done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT --query "ATTACH DICTIONARY database_for_dict.dict2" ||:
+    while true; do CLICKHOUSE_CLIENT --query "ATTACH DICTIONARY database_for_dict.dict2" ||:; done
 }
 
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT -n -q "
+    while true; do $CLICKHOUSE_CLIENT -n -q "
         SELECT * FROM database_for_dict.dict1 FORMAT Null;
         SELECT * FROM database_for_dict.dict2 FORMAT Null;
-    " ||:
+    " ||: ; done
 }
 
 function thread5()
 {
-    $CLICKHOUSE_CLIENT -n -q "
+    while true; do $CLICKHOUSE_CLIENT -n -q "
         SELECT dictGetString('database_for_dict.dict1', 'value_column', toUInt64(number)) from numbers(1000) FROM FORMAT Null;
         SELECT dictGetString('database_for_dict.dict2', 'value_column', toUInt64(number)) from numbers(1000) FROM FORMAT Null;
-    " ||:
+    " ||: ; done
 }
 
 function thread6()
 {
-    $CLICKHOUSE_CLIENT -q "DETACH DICTIONARY database_for_dict.dict1"
+    while true; do $CLICKHOUSE_CLIENT -q "DETACH DICTIONARY database_for_dict.dict1"; done
 }
 
 function thread7()
 {
-    $CLICKHOUSE_CLIENT -q "DETACH DICTIONARY database_for_dict.dict2"
+    while true; do $CLICKHOUSE_CLIENT -q "DETACH DICTIONARY database_for_dict.dict2"; done
 }
 
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
-export -f thread5
-export -f thread6
-export -f thread7
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
+export -f thread5;
+export -f thread6;
+export -f thread7;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread7 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2> /dev/null &
+timeout $TIMEOUT bash -c thread7 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread7 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2> /dev/null &
+timeout $TIMEOUT bash -c thread7 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread7 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2> /dev/null &
+timeout $TIMEOUT bash -c thread7 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread6 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread7 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread6 2> /dev/null &
+timeout $TIMEOUT bash -c thread7 2> /dev/null &
 
 wait
 $CLICKHOUSE_CLIENT -q "SELECT 'Still alive'"
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
index aa3e1b612dc..54a7e940377 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: long
 
 set -e
 
@@ -30,15 +29,19 @@ EOF
 
 function alter_thread()
 {
+    trap 'exit' INT
+
     ALTERS[0]="ALTER TABLE mv MODIFY QUERY SELECT v FROM src;"
     ALTERS[1]="ALTER TABLE mv MODIFY QUERY SELECT v * 2 as v FROM src;"
 
-    $CLICKHOUSE_CLIENT --allow_experimental_alter_materialized_view_structure=1 -q "${ALTERS[$RANDOM % 2]}"
-    sleep 0.$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT --allow_experimental_alter_materialized_view_structure=1 -q "${ALTERS[$RANDOM % 2]}"
+        sleep "$(echo 0.$RANDOM)";
+    done
 }
 
-export -f alter_thread
-clickhouse_client_loop_timeout 10 alter_thread &
+export -f alter_thread;
+timeout 10 bash -c alter_thread &
 
 for _ in {1..100}; do
     # Retry (hopefully retriable (deadlock avoided)) errors.
diff --git a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
index 19c97ae96ec..4c0afc4c439 100755
--- a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
@@ -15,46 +15,66 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String) ENGINE = Repli
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT --query="ALTER TABLE src MOVE PARTITION 1 TO TABLE dst"
+    while true;
+    do
+        $CLICKHOUSE_CLIENT --query="ALTER TABLE src MOVE PARTITION 1 TO TABLE dst;" --query_id=query1
+    done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query="INSERT INTO src SELECT number % 2, toString(number) FROM system.numbers LIMIT 100000"
+    while true;
+    do
+        $CLICKHOUSE_CLIENT --query="INSERT INTO src SELECT number % 2, toString(number) FROM system.numbers LIMIT 100000" --query_id=query2
+    done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT --query="SELECT * FROM src" > /dev/null
+    while true;
+    do
+        $CLICKHOUSE_CLIENT --query="SELECT * FROM src" --query_id=query3 1> /dev/null
+    done
 }
 
 function thread4()
 {
-    $CLICKHOUSE_CLIENT --query="SELECT * FROM dst" > /dev/null
+    while true;
+    do
+        $CLICKHOUSE_CLIENT --query="SELECT * FROM dst" --query_id=query4 1> /dev/null
+    done
 }
 
 function thread5()
 {
-    $CLICKHOUSE_CLIENT --query="ALTER TABLE src MOVE PARTITION 1 TO TABLE dst"
+    while true;
+    do
+        $CLICKHOUSE_CLIENT --query="ALTER TABLE src MOVE PARTITION 1 TO TABLE dst;" --query_id=query5
+    done
 }
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
-export -f thread5
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
+export -f thread5;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread5 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread4 2> /dev/null &
+timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
 wait
 
 echo "DROP TABLE src NO DELAY" | ${CLICKHOUSE_CLIENT}
 echo "DROP TABLE dst NO DELAY" | ${CLICKHOUSE_CLIENT}
+sleep 5
+
+# Check for deadlocks
+echo "SELECT * FROM system.processes WHERE query_id LIKE 'query%'" | ${CLICKHOUSE_CLIENT}
 
 echo 'did not crash'
diff --git a/tests/queries/0_stateless/01047_window_view_parser_inner_table.reference b/tests/queries/0_stateless/01047_window_view_parser_inner_table.reference
index 319cbef0914..53df91c5523 100644
--- a/tests/queries/0_stateless/01047_window_view_parser_inner_table.reference
+++ b/tests/queries/0_stateless/01047_window_view_parser_inner_table.reference
@@ -10,7 +10,7 @@ CREATE TABLE test_01047.`.inner.wv`\n(\n    `b` Int32,\n    `windowID(timestamp,
 ||---FUNCTION---
 CREATE TABLE test_01047.`.inner.wv`\n(\n    `plus(a, b)` Int64,\n    `windowID(timestamp, toIntervalSecond(\'1\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY `windowID(timestamp, toIntervalSecond(\'1\'))`\nORDER BY (`windowID(timestamp, toIntervalSecond(\'1\'))`, `plus(a, b)`)\nSETTINGS index_granularity = 8192
 ||---PARTITION---
-CREATE TABLE test_01047.`.inner.wv`\n(\n    `windowID(____timestamp, toIntervalSecond(\'1\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nPARTITION BY `windowID(____timestamp, toIntervalSecond(\'1\'))`\nORDER BY `windowID(____timestamp, toIntervalSecond(\'1\'))`\nSETTINGS index_granularity = 8192
+CREATE TABLE test_01047.`.inner.wv`\n(\n    `count(a)` AggregateFunction(count, Int32),\n    `windowID(____timestamp, toIntervalSecond(\'1\'))` UInt32\n)\nENGINE = AggregatingMergeTree\nPARTITION BY `windowID(____timestamp, toIntervalSecond(\'1\'))`\nORDER BY `windowID(____timestamp, toIntervalSecond(\'1\'))`\nSETTINGS index_granularity = 8192
 ||---JOIN---
 CREATE TABLE test_01047.`.inner.wv`\n(\n    `windowID(timestamp, toIntervalSecond(\'1\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32),\n    `count(mt_2.b)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nORDER BY `windowID(timestamp, toIntervalSecond(\'1\'))`\nSETTINGS index_granularity = 8192
 CREATE TABLE test_01047.`.inner.wv`\n(\n    `windowID(timestamp, toIntervalSecond(\'1\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32),\n    `count(mt_2.b)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nORDER BY `windowID(timestamp, toIntervalSecond(\'1\'))`\nSETTINGS index_granularity = 8192
@@ -26,7 +26,7 @@ CREATE TABLE test_01047.`.inner.wv`\n(\n    `b` Int32,\n    `windowID(timestamp,
 ||---FUNCTION---
 CREATE TABLE test_01047.`.inner.wv`\n(\n    `plus(a, b)` Int64,\n    `windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nPRIMARY KEY `windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nORDER BY (`windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`, `plus(a, b)`)\nSETTINGS index_granularity = 8192
 ||---PARTITION---
-CREATE TABLE test_01047.`.inner.wv`\n(\n    `windowID(____timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nPARTITION BY `windowID(____timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nORDER BY `windowID(____timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nSETTINGS index_granularity = 8192
+CREATE TABLE test_01047.`.inner.wv`\n(\n    `count(a)` AggregateFunction(count, Int32),\n    `windowID(____timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))` UInt32\n)\nENGINE = AggregatingMergeTree\nPARTITION BY `windowID(____timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nORDER BY `windowID(____timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nSETTINGS index_granularity = 8192
 ||---JOIN---
 CREATE TABLE test_01047.`.inner.wv`\n(\n    `windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32),\n    `count(mt_2.b)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nORDER BY `windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nSETTINGS index_granularity = 8192
 CREATE TABLE test_01047.`.inner.wv`\n(\n    `windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))` UInt32,\n    `count(a)` AggregateFunction(count, Int32),\n    `count(mt_2.b)` AggregateFunction(count, Int32)\n)\nENGINE = AggregatingMergeTree\nORDER BY `windowID(timestamp, toIntervalSecond(\'1\'), toIntervalSecond(\'3\'))`\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
index 6df9cc3e258..04b1f8b65ce 100755
--- a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
+++ b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
@@ -18,44 +18,56 @@ $CLICKHOUSE_CLIENT --query="insert into test_01054.ints values (3, 3, 3, 3, 3, 3
 
 function thread1()
 {
+  for _ in {1..100}
+  do
     RAND_NUMBER_THREAD1=$($CLICKHOUSE_CLIENT --query="SELECT rand() % 100;")
     $CLICKHOUSE_CLIENT --query="select dictGet('one_cell_cache_ints', 'i8', toUInt64($RAND_NUMBER_THREAD1));"
+  done
 }
 
 
 function thread2()
 {
+  for _ in {1..100}
+  do
     RAND_NUMBER_THREAD2=$($CLICKHOUSE_CLIENT --query="SELECT rand() % 100;")
     $CLICKHOUSE_CLIENT --query="select dictGet('one_cell_cache_ints', 'i8', toUInt64($RAND_NUMBER_THREAD2));"
+  done
 }
 
 
 function thread3()
 {
+  for _ in {1..100}
+  do
     RAND_NUMBER_THREAD3=$($CLICKHOUSE_CLIENT --query="SELECT rand() % 100;")
     $CLICKHOUSE_CLIENT --query="select dictGet('one_cell_cache_ints', 'i8', toUInt64($RAND_NUMBER_THREAD3));"
+  done
 }
 
 
 function thread4()
 {
+  for _ in {1..100}
+  do
     RAND_NUMBER_THREAD4=$($CLICKHOUSE_CLIENT --query="SELECT rand() % 100;")
     $CLICKHOUSE_CLIENT --query="select dictGet('one_cell_cache_ints', 'i8', toUInt64($RAND_NUMBER_THREAD4));"
+  done
 }
 
 
-export -f thread1
-export -f thread2
-export -f thread3
-export -f thread4
+export -f thread1;
+export -f thread2;
+export -f thread3;
+export -f thread4;
 
 TIMEOUT=10
 
 # shellcheck disable=SC2188
-clickhouse_client_loop_timeout $TIMEOUT thread1 > /dev/null 2>&1 &
-clickhouse_client_loop_timeout $TIMEOUT thread2 > /dev/null 2>&1 &
-clickhouse_client_loop_timeout $TIMEOUT thread3 > /dev/null 2>&1 &
-clickhouse_client_loop_timeout $TIMEOUT thread4 > /dev/null 2>&1 &
+timeout $TIMEOUT bash -c thread1 > /dev/null 2>&1 &
+timeout $TIMEOUT bash -c thread2 > /dev/null 2>&1 &
+timeout $TIMEOUT bash -c thread3 > /dev/null 2>&1 &
+timeout $TIMEOUT bash -c thread4 > /dev/null 2>&1 &
 
 wait
 
diff --git a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
index a1a38370554..17068dcbdf9 100755
--- a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
+++ b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
@@ -38,24 +38,30 @@ LAYOUT(CACHE(SIZE_IN_CELLS 10));
 
 function thread1()
 {
-    # This query will be ended with exception, because source dictionary has UUID as a key type.
-    $CLICKHOUSE_CLIENT --query="SELECT dictGetFloat64('dictdb_01076.dict_datarace', 'value', toUInt64(1));"
+    for _ in {1..50}
+    do
+        # This query will be ended with exception, because source dictionary has UUID as a key type.
+        $CLICKHOUSE_CLIENT --query="SELECT dictGetFloat64('dictdb_01076.dict_datarace', 'value', toUInt64(1));"
+    done
 }
 
 
 function thread2()
 {
-    # This query will be ended with exception, because source dictionary has UUID as a key type.
-    $CLICKHOUSE_CLIENT --query="SELECT dictGetFloat64('dictdb_01076.dict_datarace', 'value', toUInt64(2));"
+    for _ in {1..50}
+    do
+        # This query will be ended with exception, because source dictionary has UUID as a key type.
+        $CLICKHOUSE_CLIENT --query="SELECT dictGetFloat64('dictdb_01076.dict_datarace', 'value', toUInt64(2));"
+    done
 }
 
-export -f thread1
-export -f thread2
+export -f thread1;
+export -f thread2;
 
 TIMEOUT=5
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 > /dev/null 2>&1 &
-clickhouse_client_loop_timeout $TIMEOUT thread2 > /dev/null 2>&1 &
+timeout $TIMEOUT bash -c thread1 > /dev/null 2>&1 &
+timeout $TIMEOUT bash -c thread2 > /dev/null 2>&1 &
 
 wait
 
diff --git a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
index 6c9acd6d0cd..bbc16121cb6 100755
--- a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
@@ -21,12 +21,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT -nm --query "
-        CREATE TABLE concurrent_mutate_mt_$i (key UInt64, value1 UInt64, value2 String)
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_mutate_mt', '$i')
-        ORDER BY key
-        SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0;
-    "
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_mt_$i (key UInt64, value1 UInt64, value2 String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_mutate_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_mt_1 SELECT number, number + 10, toString(number) from numbers(10)"
@@ -45,52 +40,59 @@ INITIAL_SUM=$($CLICKHOUSE_CLIENT --query "SELECT SUM(value1) FROM concurrent_mut
 # Run mutation on random replica
 function correct_alter_thread()
 {
-    REPLICA=$(($RANDOM % 5 + 1))
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_mutate_mt_$REPLICA UPDATE value1 = value1 + 1 WHERE 1"
-    sleep 1
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_mutate_mt_$REPLICA UPDATE value1 = value1 + 1 WHERE 1";
+        sleep 1
+    done
 }
 
 # This thread add some data to table.
 function insert_thread()
 {
+
     VALUES=(7 8 9)
-    REPLICA=$(($RANDOM % 5 + 1))
-    VALUE=${VALUES[$RANDOM % ${#VALUES[@]} ]}
-    $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_mt_$REPLICA VALUES($RANDOM, $VALUE, toString($VALUE))"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        VALUE=${VALUES[$RANDOM % ${#VALUES[@]} ]}
+        $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_mt_$REPLICA VALUES($RANDOM, $VALUE, toString($VALUE))"
+        sleep 0.$RANDOM
+    done
 }
 
 function detach_attach_thread()
 {
-    REPLICA=$(($RANDOM % 5 + 1))
-    $CLICKHOUSE_CLIENT --query "DETACH TABLE concurrent_mutate_mt_$REPLICA"
-    sleep 0.$RANDOM
-    sleep 0.$RANDOM
-    sleep 0.$RANDOM
-    $CLICKHOUSE_CLIENT --query "ATTACH TABLE concurrent_mutate_mt_$REPLICA"
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "DETACH TABLE concurrent_mutate_mt_$REPLICA"
+        sleep 0.$RANDOM
+        sleep 0.$RANDOM
+        sleep 0.$RANDOM
+        $CLICKHOUSE_CLIENT --query "ATTACH TABLE concurrent_mutate_mt_$REPLICA"
+    done
 }
 
 
 echo "Starting alters"
 
-export -f correct_alter_thread
-export -f insert_thread
-export -f detach_attach_thread
+export -f correct_alter_thread;
+export -f insert_thread;
+export -f detach_attach_thread;
 
 # We assign a lot of mutations so timeout shouldn't be too big
 TIMEOUT=15
 
-clickhouse_client_loop_timeout $TIMEOUT detach_attach_thread 2> /dev/null &
+timeout $TIMEOUT bash -c detach_attach_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT correct_alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c correct_alter_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01077_mutations_index_consistency.sh b/tests/queries/0_stateless/01077_mutations_index_consistency.sh
index 31086ed6784..c41eab62ecb 100755
--- a/tests/queries/0_stateless/01077_mutations_index_consistency.sh
+++ b/tests/queries/0_stateless/01077_mutations_index_consistency.sh
@@ -7,9 +7,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS movement"
 
-$CLICKHOUSE_CLIENT -n --query "CREATE TABLE movement (date DateTime('Europe/Moscow')) Engine = MergeTree ORDER BY (toStartOfHour(date));"
+$CLICKHOUSE_CLIENT -n --query "CREATE TABLE movement (date DateTime('Asia/Istanbul')) Engine = MergeTree ORDER BY (toStartOfHour(date));"
 
-$CLICKHOUSE_CLIENT --query "insert into movement select toDateTime('2020-01-22 00:00:00', 'Europe/Moscow') + number%(23*3600) from numbers(1000000);"
+$CLICKHOUSE_CLIENT --query "insert into movement select toDateTime('2020-01-22 00:00:00', 'Asia/Istanbul') + number%(23*3600) from numbers(1000000);"
 
 $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE movement FINAL"
 
@@ -18,20 +18,20 @@ SELECT
     count(),
     toStartOfHour(date) AS Hour
 FROM movement
-WHERE (date >= toDateTime('2020-01-22T10:00:00', 'Europe/Moscow')) AND (date <= toDateTime('2020-01-22T23:00:00', 'Europe/Moscow'))
+WHERE (date >= toDateTime('2020-01-22T10:00:00', 'Asia/Istanbul')) AND (date <= toDateTime('2020-01-22T23:00:00', 'Asia/Istanbul'))
 GROUP BY Hour
 ORDER BY Hour DESC
 " | grep "16:00:00" | cut -f1
 
 
-$CLICKHOUSE_CLIENT --query "alter table movement delete where date >= toDateTime('2020-01-22T16:00:00', 'Europe/Moscow')  and date < toDateTime('2020-01-22T17:00:00', 'Europe/Moscow') SETTINGS mutations_sync = 2"
+$CLICKHOUSE_CLIENT --query "alter table movement delete where date >= toDateTime('2020-01-22T16:00:00', 'Asia/Istanbul')  and date < toDateTime('2020-01-22T17:00:00', 'Asia/Istanbul') SETTINGS mutations_sync = 2"
 
 $CLICKHOUSE_CLIENT -n --query "
 SELECT
     count(),
     toStartOfHour(date) AS Hour
 FROM movement
-WHERE (date >= toDateTime('2020-01-22T10:00:00', 'Europe/Moscow')) AND (date <= toDateTime('2020-01-22T23:00:00', 'Europe/Moscow'))
+WHERE (date >= toDateTime('2020-01-22T10:00:00', 'Asia/Istanbul')) AND (date <= toDateTime('2020-01-22T23:00:00', 'Asia/Istanbul'))
 GROUP BY Hour
 ORDER BY Hour DESC
 " | grep "16:00:00" | wc -l
@@ -42,7 +42,7 @@ SELECT
     count(),
     toStartOfHour(date) AS Hour
 FROM movement
-WHERE (date >= toDateTime('2020-01-22T10:00:00', 'Europe/Moscow')) AND (date <= toDateTime('2020-01-22T23:00:00', 'Europe/Moscow'))
+WHERE (date >= toDateTime('2020-01-22T10:00:00', 'Asia/Istanbul')) AND (date <= toDateTime('2020-01-22T23:00:00', 'Asia/Istanbul'))
 GROUP BY Hour
 ORDER BY Hour DESC
 " | grep "22:00:00" | cut -f1
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
index 77278ad0bf9..06d6ef6a94b 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
@@ -15,12 +15,7 @@ done
 
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT -nm --query "
-        CREATE TABLE concurrent_alter_add_drop_$i (key UInt64, value0 UInt8)
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_add_drop_column', '$i')
-        ORDER BY key
-        SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000;
-    "
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_add_drop_$i (key UInt64, value0 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_add_drop_column', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_add_drop_1 SELECT number, number + 10 from numbers(100000)"
@@ -32,54 +27,58 @@ done
 
 function alter_thread()
 {
-    REPLICA=$(($RANDOM % 3 + 1))
-    ADD=$(($RANDOM % 5 + 1))
-    # additionaly we don't wait anything for more heavy concurrency
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_add_drop_$REPLICA ADD COLUMN value$ADD UInt32 DEFAULT 42 SETTINGS replication_alter_partitions_sync=0"
-    DROP=$(($RANDOM % 5 + 1))
-    # additionaly we don't wait anything for more heavy concurrency
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_add_drop_$REPLICA DROP COLUMN value$DROP SETTINGS replication_alter_partitions_sync=0"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 3 + 1))
+        ADD=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_add_drop_$REPLICA ADD COLUMN value$ADD UInt32 DEFAULT 42 SETTINGS replication_alter_partitions_sync=0"; # additionaly we don't wait anything for more heavy concurrency
+        DROP=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_add_drop_$REPLICA DROP COLUMN value$DROP SETTINGS replication_alter_partitions_sync=0"; # additionaly we don't wait anything for more heavy concurrency
+        sleep 0.$RANDOM
+    done
 }
 
 
 function optimize_thread()
 {
-    REPLICA=$(($RANDOM % 3 + 1))
-    $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE concurrent_alter_add_drop_$REPLICA FINAL SETTINGS replication_alter_partitions_sync=0"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 3 + 1))
+        $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE concurrent_alter_add_drop_$REPLICA FINAL SETTINGS replication_alter_partitions_sync=0";
+        sleep 0.$RANDOM
+    done
 }
 
 function insert_thread()
 {
-    REPLICA=$(($RANDOM % 3 + 1))
-    $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_add_drop_$REPLICA VALUES($RANDOM, 7)"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 3 + 1))
+        $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_add_drop_$REPLICA VALUES($RANDOM, 7)"
+        sleep 0.$RANDOM
+    done
 }
 
 
 echo "Starting alters"
-export -f alter_thread
-export -f optimize_thread
-export -f insert_thread
+export -f alter_thread;
+export -f optimize_thread;
+export -f insert_thread;
 
 
 TIMEOUT=30
 
 # Sometimes we detach and attach tables
-clickhouse_client_loop_timeout $TIMEOUT alter_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT alter_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c alter_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
index 20a5f9af108..1f316b4b389 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
@@ -12,24 +12,11 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT -nm --query "
-        CREATE TABLE concurrent_alter_detach_$i (key UInt64, value1 UInt8, value2 UInt8)
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_detach', '$i')
-        ORDER BY key
-        SETTINGS
-            max_replicated_mutations_in_queue=1000,
-            number_of_free_entries_in_pool_to_execute_mutation=0,
-            max_replicated_merges_in_queue=1000,
-            temporary_directories_lifetime=10,
-            cleanup_delay_period=3,
-            cleanup_delay_period_random_add=0;
-    "
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_detach_$i (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_detach', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
 done
 
-$CLICKHOUSE_CLIENT -nm --query "
-    INSERT INTO concurrent_alter_detach_1 SELECT number, number + 10, number from numbers(10);
-    INSERT INTO concurrent_alter_detach_1 SELECT number, number + 10, number from numbers(10, 40);
-"
+$CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_detach_1 SELECT number, number + 10, number from numbers(10)"
+$CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_detach_1 SELECT number, number + 10, number from numbers(10, 40)"
 
 for i in $(seq $REPLICAS); do
     $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA concurrent_alter_detach_$i"
@@ -44,11 +31,12 @@ INITIAL_SUM=$($CLICKHOUSE_CLIENT --query "SELECT SUM(value1) FROM concurrent_alt
 function correct_alter_thread()
 {
     TYPES=(Float64 String UInt8 UInt32)
-    REPLICA=$(($RANDOM % 3 + 1))
-    TYPE=${TYPES[$RANDOM % ${#TYPES[@]} ]}
-    # additionaly we don't wait anything for more heavy concurrency
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_detach_$REPLICA MODIFY COLUMN value1 $TYPE SETTINGS replication_alter_partitions_sync=0"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 3 + 1))
+        TYPE=${TYPES[$RANDOM % ${#TYPES[@]} ]}
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_detach_$REPLICA MODIFY COLUMN value1 $TYPE SETTINGS replication_alter_partitions_sync=0"; # additionaly we don't wait anything for more heavy concurrency
+        sleep 0.$RANDOM
+    done
 }
 
 # This thread add some data to table. After we finish we can check, that
@@ -56,38 +44,43 @@ function correct_alter_thread()
 # insert queries will fail sometime because of wrong types.
 function insert_thread()
 {
+
     VALUES=(7.0 7 '7')
-    REPLICA=$(($RANDOM % 3 + 1))
-    VALUE=${VALUES[$RANDOM % ${#VALUES[@]} ]}
-    $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_detach_$REPLICA VALUES($RANDOM, $VALUE, $VALUE)"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 3 + 1))
+        VALUE=${VALUES[$RANDOM % ${#VALUES[@]} ]}
+        $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_detach_$REPLICA VALUES($RANDOM, $VALUE, $VALUE)"
+        sleep 0.$RANDOM
+    done
 }
 
 function detach_attach_thread()
 {
-    REPLICA=$(($RANDOM % 3 + 1))
-    $CLICKHOUSE_CLIENT --query "DETACH TABLE concurrent_alter_detach_$REPLICA"
-    sleep 0.$RANDOM
-    $CLICKHOUSE_CLIENT --query "ATTACH TABLE concurrent_alter_detach_$REPLICA"
+    while true; do
+        REPLICA=$(($RANDOM % 3 + 1))
+        $CLICKHOUSE_CLIENT --query "DETACH TABLE concurrent_alter_detach_$REPLICA"
+        sleep 0.$RANDOM
+        $CLICKHOUSE_CLIENT --query "ATTACH TABLE concurrent_alter_detach_$REPLICA"
+    done
 }
 
 echo "Starting alters"
-export -f correct_alter_thread
-export -f insert_thread
-export -f detach_attach_thread
+export -f correct_alter_thread;
+export -f insert_thread;
+export -f detach_attach_thread;
 
 TIMEOUT=15
 
 # Sometimes we detach and attach tables
-clickhouse_client_loop_timeout $TIMEOUT detach_attach_thread 2> /dev/null &
+timeout $TIMEOUT bash -c detach_attach_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT correct_alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c correct_alter_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
index aef23c460d8..ba8d89aad3c 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
@@ -14,11 +14,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT -nm --query "
-        CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32)
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_mt', '$i')
-        ORDER BY key
-        SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_alter_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_1 SELECT number, number + 10, number from numbers(10)"
@@ -40,10 +36,12 @@ INITIAL_SUM=$($CLICKHOUSE_CLIENT --query "SELECT SUM(value1) FROM concurrent_alt
 function correct_alter_thread()
 {
     TYPES=(Float64 String UInt8 UInt32)
-    REPLICA=$(($RANDOM % 5 + 1))
-    TYPE=${TYPES[$RANDOM % ${#TYPES[@]} ]}
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_mt_$REPLICA MODIFY COLUMN value1 $TYPE SETTINGS replication_alter_partitions_sync=0"; # additionaly we don't wait anything for more heavy concurrency
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        TYPE=${TYPES[$RANDOM % ${#TYPES[@]} ]}
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_alter_mt_$REPLICA MODIFY COLUMN value1 $TYPE SETTINGS replication_alter_partitions_sync=0"; # additionaly we don't wait anything for more heavy concurrency
+        sleep 0.$RANDOM
+    done
 }
 
 # This thread add some data to table. After we finish we can check, that
@@ -51,49 +49,56 @@ function correct_alter_thread()
 # insert queries will fail sometime because of wrong types.
 function insert_thread()
 {
+
     VALUES=(7.0 7 '7')
-    REPLICA=$(($RANDOM % 5 + 1))
-    VALUE=${VALUES[$RANDOM % ${#VALUES[@]} ]}
-    $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_$REPLICA VALUES($RANDOM, $VALUE, $VALUE)"
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        VALUE=${VALUES[$RANDOM % ${#VALUES[@]} ]}
+        $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_$REPLICA VALUES($RANDOM, $VALUE, $VALUE)"
+        sleep 0.$RANDOM
+    done
 }
 
 # Some select load, to be sure, that our selects work in concurrent execution with alters
 function select_thread()
 {
-    REPLICA=$(($RANDOM % 5 + 1))
-    $CLICKHOUSE_CLIENT --query "SELECT SUM(toUInt64(value1)) FROM concurrent_alter_mt_$REPLICA" 1>/dev/null
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "SELECT SUM(toUInt64(value1)) FROM concurrent_alter_mt_$REPLICA" 1>/dev/null
+        sleep 0.$RANDOM
+    done
 }
 
 
 echo "Starting alters"
-export -f correct_alter_thread
-export -f insert_thread
-export -f select_thread
+export -f correct_alter_thread;
+export -f insert_thread;
+export -f select_thread;
 
 
 TIMEOUT=30
 
 
 # Selects should run successfully
-clickhouse_client_loop_timeout $TIMEOUT select_thread &
-clickhouse_client_loop_timeout $TIMEOUT select_thread &
-clickhouse_client_loop_timeout $TIMEOUT select_thread &
+timeout $TIMEOUT bash -c select_thread &
+timeout $TIMEOUT bash -c select_thread &
+timeout $TIMEOUT bash -c select_thread &
 
-clickhouse_client_loop_timeout $TIMEOUT correct_alter_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT correct_alter_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT correct_alter_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c correct_alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c correct_alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c correct_alter_thread 2> /dev/null &
+
+
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01084_window_view_with_table_identifier.reference b/tests/queries/0_stateless/01084_window_view_with_table_identifier.reference
new file mode 100644
index 00000000000..de722f47f08
--- /dev/null
+++ b/tests/queries/0_stateless/01084_window_view_with_table_identifier.reference
@@ -0,0 +1,7 @@
+1	1	1990-01-01 12:00:05
+1	2	1990-01-01 12:00:05
+1	3	1990-01-01 12:00:05
+1	4	1990-01-01 12:00:10
+1	5	1990-01-01 12:00:10
+1	6	1990-01-01 12:00:15
+1	7	1990-01-01 12:00:15
diff --git a/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
new file mode 100755
index 00000000000..76d19a4d488
--- /dev/null
+++ b/tests/queries/0_stateless/01084_window_view_with_table_identifier.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery <<EOF
+SET allow_experimental_window_view = 1;
+DROP TABLE IF EXISTS mt;
+DROP TABLE IF EXISTS wv;
+
+CREATE TABLE mt(a Int32, market Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
+CREATE WINDOW VIEW wv INNER ENGINE AggregatingMergeTree ORDER BY tuple(tumble(timestamp, INTERVAL '5' SECOND, 'US/Samoa'), market) ENGINE Memory WATERMARK=ASCENDING AS SELECT count(mt.a) AS count, market, tumbleEnd(wid) AS w_end FROM mt GROUP BY tumble(mt.timestamp, INTERVAL '5' SECOND, 'US/Samoa') AS wid, market;
+
+INSERT INTO mt VALUES (1, 1, toDateTime('1990/01/01 12:00:00', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 2, toDateTime('1990/01/01 12:00:01', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 3, toDateTime('1990/01/01 12:00:02', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 4, toDateTime('1990/01/01 12:00:05', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 5, toDateTime('1990/01/01 12:00:06', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 6, toDateTime('1990/01/01 12:00:10', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 7, toDateTime('1990/01/01 12:00:11', 'US/Samoa'));
+INSERT INTO mt VALUES (1, 8, toDateTime('1990/01/01 12:00:30', 'US/Samoa'));
+EOF
+
+while true; do
+	$CLICKHOUSE_CLIENT --query="SELECT count(*) FROM wv" | grep -q "7" && break || sleep .5 ||:
+done
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM wv ORDER BY market, w_end;"
+$CLICKHOUSE_CLIENT --query="DROP TABLE wv"
+$CLICKHOUSE_CLIENT --query="DROP TABLE mt"
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections.sh b/tests/queries/0_stateless/01085_max_distributed_connections.sh
index 8a74935c05d..34862289d1e 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections.sh
@@ -18,6 +18,6 @@ while [[ $i -lt $retries ]]; do
     # 10 less then 20 seconds (20 streams), but long enough to cover possible load peaks
     # "$@" left to pass manual options (like --experimental_use_processors 0) during manual testing
 
-    clickhouse_client_timeout 10s ${CLICKHOUSE_CLIENT} "${opts[@]}" "$@" && break
+    timeout 10s ${CLICKHOUSE_CLIENT} "${opts[@]}" "$@" && break
     ((++i))
 done
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
index 6e840f44930..0e40918257d 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
@@ -15,5 +15,3 @@ while [[ $i -lt $retries ]]; do
     timeout 1.8s ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&max_distributed_connections=2&max_threads=1" -d "$query" && break
     ((++i))
 done
-
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/01087_storage_generate.reference b/tests/queries/0_stateless/01087_storage_generate.reference
index 78c6784f7d2..00ea8ac914f 100644
--- a/tests/queries/0_stateless/01087_storage_generate.reference
+++ b/tests/queries/0_stateless/01087_storage_generate.reference
@@ -1,103 +1,103 @@
 100
 -
-[]	-54259.6828	('2088-03-01 16:26:24.094','d3c2a216-a98c-d56c-7bf7-62de9f264cf4')
-[88]	34528.4014	('2031-12-09 00:40:39.898','9ef777c8-de0e-d25e-e16c-5b624f88523c')
-[-1]	121968.7945	('2060-02-05 09:18:12.011','7655e515-d2ca-2f06-0950-e4f44f69aca7')
-[-103,75]	-135033.4349	('2038-12-19 20:38:58.695','86b57d15-292d-2517-9acf-47cd053e7a3a')
-[110]	-202668.69	('2009-06-18 01:53:29.808','bc630f78-7d58-0c46-dd4b-27fc35625e96')
-[-22,2]	168636.9728	('2074-09-03 09:20:20.936','7624ce27-9bff-4e9d-3f18-6851a97dd0ca')
-[-22,-62]	-75192.4989	('2085-10-11 21:51:12.855','a4c4d0ed-f448-244e-1723-ca1bba816f2b')
-[-2,-90]	133592.5064	('2010-10-28 21:18:04.633','8ba9103b-f90c-b49b-38c1-223ae5f42bf7')
-[-94,80]	197330.6359	('2024-03-30 22:08:45.772','83442013-3677-5097-065d-72dfbe8a3506')
-[23]	167557.6237	('2078-07-25 21:54:42.480','be14d98e-5b24-54ee-c959-d24fa9a58fdd')
-[46,-10,-63]	185107.1979	('2040-10-07 06:06:53.504','5ed1fe6a-9313-41d7-4bf9-3948e961509f')
-[-107,68]	-163781.3045	('2021-12-21 19:18:58.933','7b634f19-0863-829e-484b-be288aab54a1')
-[-35,-116,73]	-203577.5379	('2093-08-01 20:21:09.407','d371bad4-b098-ffdd-f84c-6a02390c2939')
-[61]	152284.9386	('2089-12-20 19:21:33.149','9e8426c1-278a-4d9c-4076-364a95b065e3')
-[75]	170968.4171	('2020-07-17 15:45:31.975','47397a81-bda7-8bd9-59f7-d60e2204fe99')
-[-115,93]	-173740.5652	('2098-04-25 22:10:33.327','117e31dd-102e-ee6c-0dbd-0a4203c18ca5')
-[-20,4,21]	63834.8685	('2000-07-08 18:09:40.271','10b0fa48-55a3-755a-4a44-36315ae04c1c')
-[-110,117,91]	-160640.1506	('1998-04-18 10:58:04.479','6dfa3a8e-6e65-543c-5f50-1ff45835aa5a')
-[62]	63817.7977	('2043-01-24 02:07:18.972','98b8ef31-4f65-2f8b-1ea7-b1473900099e')
-[-2]	-175477.0173	('2007-01-16 07:46:14.781','ec92f616-6e1f-003a-54c6-c5f9118d2f1b')
-[]	197663.3035	('2046-06-30 17:04:56.788','fb3244a4-8af2-104f-2a6f-25a7b7b9a112')
-[-24]	-174299.4691	('2058-02-23 14:50:58.839','d63ee868-fa93-bf8b-0264-8ebbceb13e3b')
-[95,38]	-65083.7371	('2015-03-10 13:33:16.429','47bd199c-f99e-51ea-84e9-b65cce9d167c')
-[91,110,72]	130908.9643	('2036-03-16 15:17:53.679','0dd4ca31-1e09-d7e0-f3df-60cad3cfa805')
-[]	208972.3779	('2034-03-05 22:29:21.994','1069d77c-dfd2-912e-60b8-3c5b964f7e11')
-[-32]	167938.505	('2093-09-10 20:39:39.050','9d1025b6-2d0c-1d84-dafd-02668eb29270')
-[]	153744.6987	('2088-10-02 11:02:11.024','a88e6cb7-2210-5ce5-6bcf-24afc0eca5b6')
-[67]	-74220.665	('2074-12-30 18:43:40.817','68096065-18c8-8aca-fd21-15330ead669d')
-[6]	66759.8938	('2091-09-01 19:07:18.219','bb14f4cc-0b54-9a8c-e835-71333b28c03b')
-[-28,-82,9]	168625.3131	('2002-03-20 21:02:30.321','405bb877-6e28-8b91-cb62-bd82a3fa797c')
-[]	-19760.167	('2044-11-08 07:52:03.325','13769348-9e58-0e75-3972-8bbadc150715')
-[]	160663.7797	('2025-04-12 13:17:53.501','e6370321-94f5-97e6-0348-a84e72ff5b42')
-[-17,18]	99105.9856	('1972-05-01 12:23:11.688','02618b9e-97cd-4698-d2e8-3f52f4c5a09a')
-[86,77]	-116990.3914	('1981-12-31 05:06:54.198','3ac42bb4-8652-b1a8-10bb-98f0337261f8')
-[-109,69,-63]	-151527.3587	('2001-01-17 11:19:56.504','77fe7ee2-f279-2855-bfd2-a7d7cee678cc')
-[]	-57762.3928	('1978-08-16 18:47:37.660','ab9a110a-fd8d-3c4c-5a49-34c2005536ce')
-[-77]	107274.6407	('2017-01-12 12:03:02.657','c1ad4f17-cc54-45f3-9410-9c1011653f6d')
-[]	107133.641	('2050-10-05 06:29:27.154','36e576aa-c77f-994e-1925-4a4c40da3a0f')
-[]	46672.2176	('2094-01-21 20:25:39.144','e9ba850d-604e-bc7d-417c-1078e89d4615')
-[-87,-122,-65]	-86258.4663	('2081-06-17 03:37:45.498','64795221-9719-7937-b4d2-be5f30065ece')
-[-53]	-48672.1424	('1992-06-27 17:27:23.602','7c67bc31-c7bb-6197-fdca-f73329b976f2')
-[34]	-108954.782	('2096-07-03 23:06:30.632','9c1b37d7-4ced-9428-a0ae-34c5436b14c4')
-[]	-168124.2364	('1987-06-03 06:47:12.945','d1c39af4-f920-5095-b8e2-0f878950167b')
-[]	-112431.4799	('2021-07-26 07:04:58.527','da07a72d-7e1f-8890-4c4b-326835d11b39')
-[-35,-95,58]	-181254.9139	('2086-11-12 17:17:14.473','22f74d0b-dfc0-3f7a-33f4-8055d8fa7846')
-[98,119]	11468.5238	('2092-02-25 11:07:07.695','a1fb97bf-1885-6715-c233-b88a6cd111e4')
-[]	82333.8963	('1989-11-23 01:38:57.012','a2b82b5b-8331-555c-579b-de4b0eeb7e81')
-[-5,-66,69]	32055.8376	('2040-12-17 16:49:08.704','4537d25e-a2db-ea9a-8e24-a16ed7e0c6e4')
-[81,-84,-24]	-210815.2512	('2047-06-09 13:30:06.922','ac3c5b5f-f977-2830-c398-d10a6076a498')
-[84,-105]	-175413.7733	('1998-11-03 04:30:21.191','c535feac-1943-c0a1-23f0-645d5406db24')
-[58,31]	-335.8512	('1973-07-09 12:21:10.444','24a7dd3d-2565-1de3-05d9-e45fd8ba7729')
-[-49,-47]	177399.2836	('2049-03-15 15:33:00.190','e4432b9b-61e9-d451-dc87-ae3b9da6fd35')
-[]	211525.2349	('2106-01-11 10:44:18.918','23315435-7132-05b5-5a9b-c2c738433a87')
-[45,-95,-39]	-15314.9732	('2055-10-29 13:51:12.182','833b2efa-8c72-f5f6-3040-cb4831e8ceb9')
-[]	213384.5774	('2067-02-10 22:02:42.113','0cd7f438-caa7-0d21-867c-1fdb6d67d797')
-[99]	-147316.5599	('2000-05-09 21:37:34.776','a3ea6796-38d5-72ff-910d-8b4300831916')
-[]	8828.2471	('1993-11-30 16:53:22.503','7209213f-38bb-cfed-1955-f1fad5a9577a')
-[117,9,-35]	-134812.6269	('2065-09-04 23:47:26.589','d33d0d6f-b9c0-2850-4593-cfc9f1e20a4d')
-[-35,-58,-101]	-9101.5369	('2023-08-24 20:56:11.695','87fbe3f9-b1f0-c030-a4c0-8662045923b4')
-[-58,87]	122510.9099	('2019-08-09 17:40:29.849','c1d3a2cc-878f-c2c3-4a0b-10e98cda8b4a')
-[4,19,58]	-13496.8672	('2027-05-01 09:11:48.659','8996ae31-d670-cbfe-b735-b16b7c3b3476')
-[23,-75,-89]	-51218.286	('2010-06-02 02:49:03.396','d32b8b61-cc3e-31fa-2a2a-abefa60bfcee')
-[50]	-45297.4315	('2087-04-15 06:46:08.247','04fe9603-97fc-07a4-6248-0f21e408c884')
-[-23,17,63]	89185.9462	('2065-10-26 08:27:12.817','a5fbf764-70b4-8b65-4a8f-7550abca3859')
-[-6]	-129925.369	('2013-11-05 07:44:45.233','11db26b3-e2b5-b9fa-6b0e-79c43a2e67ab')
-[-72,-108]	203171.5475	('2000-01-28 09:34:58.032','14d5399e-7949-20c7-0e47-85e2fce5836c')
-[-73,34,-27]	2676.7265	('2057-10-25 14:37:10.049','00049a92-4350-badb-3764-dd7f019b9b31')
-[65,-7]	-153472.9461	('1973-04-12 02:34:41.245','e0a0324d-1552-d11e-f3a5-fbd822d206c5')
-[]	81837.7838	('2041-09-20 20:56:39.712','f7923f2c-e526-1706-79b9-58045d9deaa7')
-[-113,8]	173192.6905	('2066-04-02 09:59:59.356','e3013e5c-92e3-c03c-b57a-e1939e00a1a7')
-[107]	9694.1102	('1984-11-02 13:11:34.034','e973db18-07b7-2117-f3ba-e7002adfa939')
-[]	-76460.9664	('2051-02-10 09:54:42.143','b8344c22-9e8a-7052-c644-9c3e5989cdf1')
-[59,59,0]	27041.7606	('2083-02-17 18:21:22.547','4d6b137b-a3e1-f36d-2c0c-c8d718dda388')
-[-114]	133673.963	('2005-10-02 20:34:27.452','04785b75-30e5-af8b-547e-d15bcb7f49fb')
-[43]	-169861.2	('2006-12-13 09:26:13.923','cb865d38-d961-d7f9-acbb-583b9f31252f')
-[]	197115.2174	('2060-04-08 04:17:00.488','0f26c4b4-b24c-1fd5-c619-31bcf71a4831')
-[-25]	-200081.9506	('2055-12-25 02:30:16.276','0b32ad69-2c84-4269-9718-e3171482878a')
-[14,110]	-40196.4463	('2084-08-13 19:37:07.588','ed882071-acba-b3ab-5d77-d79a9544a834')
-[-62,-71,-82]	-154958.9747	('2100-07-08 02:32:53.741','7711c7c1-0d22-e302-fc86-61ef5e68db96')
-[96,-114,-101]	78910.332	('2100-07-19 15:02:27.109','756bfd26-c4b3-94b8-e991-c7ab7a833b76')
-[49]	80117.2267	('1970-07-04 03:50:56.748','aebac019-9054-4a77-2ccd-8801fc4a7496')
-[]	102078.4801	('2055-01-07 01:22:33.624','21f2e59a-a1ca-5df3-27fd-aa95456cfbe5')
-[-106]	-108728.4237	('2020-05-27 11:56:18.121','6b7b6674-9342-2360-4cc0-f7ef8a2404de')
-[]	173213.5631	('2034-01-18 19:04:16.059','2dc0038d-67c1-f0ee-280b-f3f0f536b01a')
-[42]	139872.2503	('2001-07-16 11:09:28.754','d6487da6-1077-1053-f314-9a1079f5df15')
-[]	1107.5244	('2031-02-26 15:06:00.846','b32bee8f-85b7-3c71-bb24-9a0093e6a08c')
-[]	85892.8913	('2088-04-13 14:54:18.514','84f3b59b-8d23-78a6-3032-91392344584f')
-[43]	-109644.2714	('1974-07-04 14:45:43.139','cf722ca8-15f5-6fe2-997c-0cf88e95e902')
-[]	212557.3762	('2069-03-03 07:21:08.439','9e676cac-36e6-2962-f7b1-578214f0dfbd')
-[-128,55]	80471.0777	('1970-04-01 18:54:40.257','ca358854-416b-9c95-0b9b-c7fed7bb7cb5')
-[-30,-54]	-132205.4512	('2017-12-15 22:54:15.750','3558faa4-2d2f-c533-437f-1e03d3600f1d')
-[-116,-72]	-91499.667	('2105-09-23 21:06:17.755','07bb6e47-3234-c268-40d7-332388dc06f8')
-[]	-201636.5228	('2085-01-27 07:54:42.717','86c3bdc3-ff0f-1723-07c2-845aa3c02370')
-[-103,-39]	44330.7722	('2064-07-02 11:08:28.068','0869c79d-6bdd-5d2d-a3d1-ffe13f6aa810')
-[99]	-31035.5391	('2093-07-26 01:50:23.026','aeb59338-254f-dc09-fbd7-263da415e211')
-[101]	157961.4729	('2036-05-04 02:35:07.845','8b6221a9-8dad-4655-7460-6b3031b06893')
-[111]	84732.4403	('1997-04-06 16:10:18.624','08806a79-59f4-c833-eedc-a200bb851767')
-[9,-48]	-190491.559	('2031-11-03 19:47:03.757','914e6166-c96e-e0e4-101a-0bb516cf5a2f')
-[-41]	-132501.8311	('2089-11-21 21:38:28.848','6de6cc8d-3c49-641e-fb12-87ed5ecb97b0')
-[77]	64903.6579	('1985-04-17 17:08:03.998','26484b8a-f3f1-587f-7777-bc7a57a689c3')
+[]	-54259.6828	('2088-03-01 13:26:24.094','d3c2a216-a98c-d56c-7bf7-62de9f264cf4')
+[88]	34528.4014	('2031-12-08 21:40:39.898','9ef777c8-de0e-d25e-e16c-5b624f88523c')
+[-1]	121968.7945	('2060-02-05 06:18:12.011','7655e515-d2ca-2f06-0950-e4f44f69aca7')
+[-103,75]	-135033.4349	('2038-12-19 17:38:58.695','86b57d15-292d-2517-9acf-47cd053e7a3a')
+[110]	-202668.69	('2009-06-17 21:53:29.808','bc630f78-7d58-0c46-dd4b-27fc35625e96')
+[-22,2]	168636.9728	('2074-09-03 06:20:20.936','7624ce27-9bff-4e9d-3f18-6851a97dd0ca')
+[-22,-62]	-75192.4989	('2085-10-11 18:51:12.855','a4c4d0ed-f448-244e-1723-ca1bba816f2b')
+[-2,-90]	133592.5064	('2010-10-28 17:18:04.633','8ba9103b-f90c-b49b-38c1-223ae5f42bf7')
+[-94,80]	197330.6359	('2024-03-30 19:08:45.772','83442013-3677-5097-065d-72dfbe8a3506')
+[23]	167557.6237	('2078-07-25 18:54:42.480','be14d98e-5b24-54ee-c959-d24fa9a58fdd')
+[46,-10,-63]	185107.1979	('2040-10-07 03:06:53.504','5ed1fe6a-9313-41d7-4bf9-3948e961509f')
+[-107,68]	-163781.3045	('2021-12-21 16:18:58.933','7b634f19-0863-829e-484b-be288aab54a1')
+[-35,-116,73]	-203577.5379	('2093-08-01 17:21:09.407','d371bad4-b098-ffdd-f84c-6a02390c2939')
+[61]	152284.9386	('2089-12-20 16:21:33.149','9e8426c1-278a-4d9c-4076-364a95b065e3')
+[75]	170968.4171	('2020-07-17 12:45:31.975','47397a81-bda7-8bd9-59f7-d60e2204fe99')
+[-115,93]	-173740.5652	('2098-04-25 19:10:33.327','117e31dd-102e-ee6c-0dbd-0a4203c18ca5')
+[-20,4,21]	63834.8685	('2000-07-08 14:09:40.271','10b0fa48-55a3-755a-4a44-36315ae04c1c')
+[-110,117,91]	-160640.1506	('1998-04-18 06:58:04.479','6dfa3a8e-6e65-543c-5f50-1ff45835aa5a')
+[62]	63817.7977	('2043-01-23 23:07:18.972','98b8ef31-4f65-2f8b-1ea7-b1473900099e')
+[-2]	-175477.0173	('2007-01-16 04:46:14.781','ec92f616-6e1f-003a-54c6-c5f9118d2f1b')
+[]	197663.3035	('2046-06-30 14:04:56.788','fb3244a4-8af2-104f-2a6f-25a7b7b9a112')
+[-24]	-174299.4691	('2058-02-23 11:50:58.839','d63ee868-fa93-bf8b-0264-8ebbceb13e3b')
+[95,38]	-65083.7371	('2015-03-10 10:33:16.429','47bd199c-f99e-51ea-84e9-b65cce9d167c')
+[91,110,72]	130908.9643	('2036-03-16 12:17:53.679','0dd4ca31-1e09-d7e0-f3df-60cad3cfa805')
+[]	208972.3779	('2034-03-05 19:29:21.994','1069d77c-dfd2-912e-60b8-3c5b964f7e11')
+[-32]	167938.505	('2093-09-10 17:39:39.050','9d1025b6-2d0c-1d84-dafd-02668eb29270')
+[]	153744.6987	('2088-10-02 08:02:11.024','a88e6cb7-2210-5ce5-6bcf-24afc0eca5b6')
+[67]	-74220.665	('2074-12-30 15:43:40.817','68096065-18c8-8aca-fd21-15330ead669d')
+[6]	66759.8938	('2091-09-01 16:07:18.219','bb14f4cc-0b54-9a8c-e835-71333b28c03b')
+[-28,-82,9]	168625.3131	('2002-03-20 18:02:30.321','405bb877-6e28-8b91-cb62-bd82a3fa797c')
+[]	-19760.167	('2044-11-08 04:52:03.325','13769348-9e58-0e75-3972-8bbadc150715')
+[]	160663.7797	('2025-04-12 10:17:53.501','e6370321-94f5-97e6-0348-a84e72ff5b42')
+[-17,18]	99105.9856	('1972-05-01 09:23:11.688','02618b9e-97cd-4698-d2e8-3f52f4c5a09a')
+[86,77]	-116990.3914	('1981-12-31 02:06:54.198','3ac42bb4-8652-b1a8-10bb-98f0337261f8')
+[-109,69,-63]	-151527.3587	('2001-01-17 08:19:56.504','77fe7ee2-f279-2855-bfd2-a7d7cee678cc')
+[]	-57762.3928	('1978-08-16 15:47:37.660','ab9a110a-fd8d-3c4c-5a49-34c2005536ce')
+[-77]	107274.6407	('2017-01-12 09:03:02.657','c1ad4f17-cc54-45f3-9410-9c1011653f6d')
+[]	107133.641	('2050-10-05 03:29:27.154','36e576aa-c77f-994e-1925-4a4c40da3a0f')
+[]	46672.2176	('2094-01-21 17:25:39.144','e9ba850d-604e-bc7d-417c-1078e89d4615')
+[-87,-122,-65]	-86258.4663	('2081-06-17 00:37:45.498','64795221-9719-7937-b4d2-be5f30065ece')
+[-53]	-48672.1424	('1992-06-27 13:27:23.602','7c67bc31-c7bb-6197-fdca-f73329b976f2')
+[34]	-108954.782	('2096-07-03 20:06:30.632','9c1b37d7-4ced-9428-a0ae-34c5436b14c4')
+[]	-168124.2364	('1987-06-03 02:47:12.945','d1c39af4-f920-5095-b8e2-0f878950167b')
+[]	-112431.4799	('2021-07-26 04:04:58.527','da07a72d-7e1f-8890-4c4b-326835d11b39')
+[-35,-95,58]	-181254.9139	('2086-11-12 14:17:14.473','22f74d0b-dfc0-3f7a-33f4-8055d8fa7846')
+[98,119]	11468.5238	('2092-02-25 08:07:07.695','a1fb97bf-1885-6715-c233-b88a6cd111e4')
+[]	82333.8963	('1989-11-22 22:38:57.012','a2b82b5b-8331-555c-579b-de4b0eeb7e81')
+[-5,-66,69]	32055.8376	('2040-12-17 13:49:08.704','4537d25e-a2db-ea9a-8e24-a16ed7e0c6e4')
+[81,-84,-24]	-210815.2512	('2047-06-09 10:30:06.922','ac3c5b5f-f977-2830-c398-d10a6076a498')
+[84,-105]	-175413.7733	('1998-11-03 01:30:21.191','c535feac-1943-c0a1-23f0-645d5406db24')
+[58,31]	-335.8512	('1973-07-09 09:21:10.444','24a7dd3d-2565-1de3-05d9-e45fd8ba7729')
+[-49,-47]	177399.2836	('2049-03-15 12:33:00.190','e4432b9b-61e9-d451-dc87-ae3b9da6fd35')
+[]	211525.2349	('2106-01-11 07:44:18.918','23315435-7132-05b5-5a9b-c2c738433a87')
+[45,-95,-39]	-15314.9732	('2055-10-29 10:51:12.182','833b2efa-8c72-f5f6-3040-cb4831e8ceb9')
+[]	213384.5774	('2067-02-10 19:02:42.113','0cd7f438-caa7-0d21-867c-1fdb6d67d797')
+[99]	-147316.5599	('2000-05-09 17:37:34.776','a3ea6796-38d5-72ff-910d-8b4300831916')
+[]	8828.2471	('1993-11-30 13:53:22.503','7209213f-38bb-cfed-1955-f1fad5a9577a')
+[117,9,-35]	-134812.6269	('2065-09-04 20:47:26.589','d33d0d6f-b9c0-2850-4593-cfc9f1e20a4d')
+[-35,-58,-101]	-9101.5369	('2023-08-24 17:56:11.695','87fbe3f9-b1f0-c030-a4c0-8662045923b4')
+[-58,87]	122510.9099	('2019-08-09 14:40:29.849','c1d3a2cc-878f-c2c3-4a0b-10e98cda8b4a')
+[4,19,58]	-13496.8672	('2027-05-01 06:11:48.659','8996ae31-d670-cbfe-b735-b16b7c3b3476')
+[23,-75,-89]	-51218.286	('2010-06-01 22:49:03.396','d32b8b61-cc3e-31fa-2a2a-abefa60bfcee')
+[50]	-45297.4315	('2087-04-15 03:46:08.247','04fe9603-97fc-07a4-6248-0f21e408c884')
+[-23,17,63]	89185.9462	('2065-10-26 05:27:12.817','a5fbf764-70b4-8b65-4a8f-7550abca3859')
+[-6]	-129925.369	('2013-11-05 03:44:45.233','11db26b3-e2b5-b9fa-6b0e-79c43a2e67ab')
+[-72,-108]	203171.5475	('2000-01-28 06:34:58.032','14d5399e-7949-20c7-0e47-85e2fce5836c')
+[-73,34,-27]	2676.7265	('2057-10-25 11:37:10.049','00049a92-4350-badb-3764-dd7f019b9b31')
+[65,-7]	-153472.9461	('1973-04-11 23:34:41.245','e0a0324d-1552-d11e-f3a5-fbd822d206c5')
+[]	81837.7838	('2041-09-20 17:56:39.712','f7923f2c-e526-1706-79b9-58045d9deaa7')
+[-113,8]	173192.6905	('2066-04-02 06:59:59.356','e3013e5c-92e3-c03c-b57a-e1939e00a1a7')
+[107]	9694.1102	('1984-11-02 10:11:34.034','e973db18-07b7-2117-f3ba-e7002adfa939')
+[]	-76460.9664	('2051-02-10 06:54:42.143','b8344c22-9e8a-7052-c644-9c3e5989cdf1')
+[59,59,0]	27041.7606	('2083-02-17 15:21:22.547','4d6b137b-a3e1-f36d-2c0c-c8d718dda388')
+[-114]	133673.963	('2005-10-02 16:34:27.452','04785b75-30e5-af8b-547e-d15bcb7f49fb')
+[43]	-169861.2	('2006-12-13 06:26:13.923','cb865d38-d961-d7f9-acbb-583b9f31252f')
+[]	197115.2174	('2060-04-08 01:17:00.488','0f26c4b4-b24c-1fd5-c619-31bcf71a4831')
+[-25]	-200081.9506	('2055-12-24 23:30:16.276','0b32ad69-2c84-4269-9718-e3171482878a')
+[14,110]	-40196.4463	('2084-08-13 16:37:07.588','ed882071-acba-b3ab-5d77-d79a9544a834')
+[-62,-71,-82]	-154958.9747	('2100-07-07 23:32:53.741','7711c7c1-0d22-e302-fc86-61ef5e68db96')
+[96,-114,-101]	78910.332	('2100-07-19 12:02:27.109','756bfd26-c4b3-94b8-e991-c7ab7a833b76')
+[49]	80117.2267	('1970-07-04 00:50:56.748','aebac019-9054-4a77-2ccd-8801fc4a7496')
+[]	102078.4801	('2055-01-06 22:22:33.624','21f2e59a-a1ca-5df3-27fd-aa95456cfbe5')
+[-106]	-108728.4237	('2020-05-27 08:56:18.121','6b7b6674-9342-2360-4cc0-f7ef8a2404de')
+[]	173213.5631	('2034-01-18 16:04:16.059','2dc0038d-67c1-f0ee-280b-f3f0f536b01a')
+[42]	139872.2503	('2001-07-16 07:09:28.754','d6487da6-1077-1053-f314-9a1079f5df15')
+[]	1107.5244	('2031-02-26 12:06:00.846','b32bee8f-85b7-3c71-bb24-9a0093e6a08c')
+[]	85892.8913	('2088-04-13 11:54:18.514','84f3b59b-8d23-78a6-3032-91392344584f')
+[43]	-109644.2714	('1974-07-04 11:45:43.139','cf722ca8-15f5-6fe2-997c-0cf88e95e902')
+[]	212557.3762	('2069-03-03 04:21:08.439','9e676cac-36e6-2962-f7b1-578214f0dfbd')
+[-128,55]	80471.0777	('1970-04-01 15:54:40.257','ca358854-416b-9c95-0b9b-c7fed7bb7cb5')
+[-30,-54]	-132205.4512	('2017-12-15 19:54:15.750','3558faa4-2d2f-c533-437f-1e03d3600f1d')
+[-116,-72]	-91499.667	('2105-09-23 18:06:17.755','07bb6e47-3234-c268-40d7-332388dc06f8')
+[]	-201636.5228	('2085-01-27 04:54:42.717','86c3bdc3-ff0f-1723-07c2-845aa3c02370')
+[-103,-39]	44330.7722	('2064-07-02 08:08:28.068','0869c79d-6bdd-5d2d-a3d1-ffe13f6aa810')
+[99]	-31035.5391	('2093-07-25 22:50:23.026','aeb59338-254f-dc09-fbd7-263da415e211')
+[101]	157961.4729	('2036-05-03 23:35:07.845','8b6221a9-8dad-4655-7460-6b3031b06893')
+[111]	84732.4403	('1997-04-06 12:10:18.624','08806a79-59f4-c833-eedc-a200bb851767')
+[9,-48]	-190491.559	('2031-11-03 16:47:03.757','914e6166-c96e-e0e4-101a-0bb516cf5a2f')
+[-41]	-132501.8311	('2089-11-21 18:38:28.848','6de6cc8d-3c49-641e-fb12-87ed5ecb97b0')
+[77]	64903.6579	('1985-04-17 13:08:03.998','26484b8a-f3f1-587f-7777-bc7a57a689c3')
 -
diff --git a/tests/queries/0_stateless/01087_storage_generate.sql b/tests/queries/0_stateless/01087_storage_generate.sql
index a16ad55832c..a9320791816 100644
--- a/tests/queries/0_stateless/01087_storage_generate.sql
+++ b/tests/queries/0_stateless/01087_storage_generate.sql
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS test_table;
-CREATE TABLE test_table(a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3), UUID)) ENGINE=GenerateRandom();
+CREATE TABLE test_table(a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3), UUID)) ENGINE = GenerateRandom();
 SELECT COUNT(*) FROM (SELECT * FROM test_table LIMIT 100);
 
 DROP TABLE IF EXISTS test_table;
@@ -7,11 +7,10 @@ DROP TABLE IF EXISTS test_table;
 SELECT '-';
 
 DROP TABLE IF EXISTS test_table_2;
-CREATE TABLE test_table_2(a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3, 'Europe/Moscow'), UUID)) ENGINE=GenerateRandom(10, 5, 3);
+CREATE TABLE test_table_2(a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3, 'UTC'), UUID)) ENGINE = GenerateRandom(10, 5, 3);
 
 SELECT * FROM test_table_2 LIMIT 100;
 
 SELECT '-';
 
 DROP TABLE IF EXISTS test_table_2;
-
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index ead4e97403b..d62ff5618fc 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -46,29 +46,29 @@ h
 \N
 o
 -
-Date	DateTime(\'Europe/Moscow\')	DateTime(\'Europe/Moscow\')
-2113-06-12	2050-12-17 02:46:35	2096-02-16 22:18:22
-2141-08-09	2013-10-17 23:35:26	1976-01-24 12:52:48
-2039-08-16	1974-11-17 23:22:46	1980-03-04 21:02:50
-1997-04-11	1972-09-18 23:44:08	2040-07-10 14:46:42
-2103-11-03	2044-11-23 20:57:12	1970-10-09 02:30:14
-2066-11-19	2029-12-10 03:13:55	2106-01-30 21:52:44
-2064-08-14	2016-07-14 11:33:45	2096-12-12 00:40:50
-2046-09-13	2085-07-10 18:51:14	2096-01-15 16:31:33
-2008-03-16	2047-05-16 23:28:36	2103-02-11 16:44:39
-2000-07-07	2105-07-19 19:29:06	1980-01-02 05:18:22
+Date	DateTime(\'UTC\')	DateTime(\'UTC\')
+2113-06-12	2050-12-16 23:46:35	2096-02-16 19:18:22
+2141-08-09	2013-10-17 19:35:26	1976-01-24 09:52:48
+2039-08-16	1974-11-17 20:22:46	1980-03-04 18:02:50
+1997-04-11	1972-09-18 20:44:08	2040-07-10 11:46:42
+2103-11-03	2044-11-23 17:57:12	1970-10-08 23:30:14
+2066-11-19	2029-12-10 00:13:55	2106-01-30 18:52:44
+2064-08-14	2016-07-14 08:33:45	2096-12-11 21:40:50
+2046-09-13	2085-07-10 15:51:14	2096-01-15 13:31:33
+2008-03-16	2047-05-16 20:28:36	2103-02-11 13:44:39
+2000-07-07	2105-07-19 16:29:06	1980-01-02 02:18:22
 -
-DateTime64(3, \'Europe/Moscow\')	DateTime64(6, \'Europe/Moscow\')	DateTime64(6, \'Europe/Moscow\')
-1978-06-07 23:50:57.320	2013-08-28 10:21:54.010758	1991-08-25 16:23:26.140215
-1978-08-25 17:07:25.427	2034-05-02 20:49:42.148578	2015-08-26 15:26:31.783160
-2037-04-04 10:50:56.898	2055-05-28 11:12:48.819271	2068-12-26 09:58:49.635722
-2041-09-02 07:07:24.891	2051-08-01 14:15:40.218654	2081-10-19 15:55:40.057084
-1976-07-15 23:59:41.974	2075-01-29 20:34:10.425321	1996-12-31 10:51:28.562331
-1974-11-03 08:09:51.992	2010-04-19 04:09:03.451487	1994-05-15 15:42:53.162162
-2061-10-11 20:14:02.729	1981-07-22 10:13:45.729103	2084-05-27 08:59:37.746021
-1989-12-13 02:01:16.532	1992-10-05 07:07:57.973222	2037-10-24 18:53:50.985504
-1992-12-28 12:26:04.030	1971-07-29 09:20:38.230976	1980-03-26 18:49:55.428516
-2051-12-11 10:09:13.162	1982-01-12 03:25:45.754492	2010-05-17 11:01:28.452864
+DateTime64(3, \'UTC\')	DateTime64(6, \'UTC\')	DateTime64(6, \'UTC\')
+1978-06-07 20:50:57.320	2013-08-28 06:21:54.010758	1991-08-25 13:23:26.140215
+1978-08-25 14:07:25.427	2034-05-02 17:49:42.148578	2015-08-26 12:26:31.783160
+2037-04-04 07:50:56.898	2055-05-28 08:12:48.819271	2068-12-26 06:58:49.635722
+2041-09-02 04:07:24.891	2051-08-01 11:15:40.218654	2081-10-19 12:55:40.057084
+1976-07-15 20:59:41.974	2075-01-29 17:34:10.425321	1996-12-31 07:51:28.562331
+1974-11-03 05:09:51.992	2010-04-19 00:09:03.451487	1994-05-15 11:42:53.162162
+2061-10-11 17:14:02.729	1981-07-22 06:13:45.729103	2084-05-27 05:59:37.746021
+1989-12-12 23:01:16.532	1992-10-05 04:07:57.973222	2037-10-24 15:53:50.985504
+1992-12-28 09:26:04.030	1971-07-29 06:20:38.230976	1980-03-26 15:49:55.428516
+2051-12-11 07:09:13.162	1982-01-12 00:25:45.754492	2010-05-17 07:01:28.452864
 Date32
 1934-01-06
 2039-08-16
@@ -225,25 +225,25 @@ U6
 \'%Y~t9
 RL,{Xs\\tw
 -
-[]	-27467.1221	('2021-03-08 03:39:14.331','08ec773f-cded-8c46-727f-954768082cbf')
-[]	204013.7193	('2026-05-05 05:20:23.160','30f6d580-cb25-8d4f-f869-fc10128b3389')
-[-122]	-9432.2617	('2001-08-23 08:05:41.222','f7bf2154-78c3-8920-e4d3-a374e22998a4')
-[-30,61]	-133488.2399	('2048-05-14 09:05:06.021','a6af106c-b321-978b-fa79-338c9e342b5a')
-[-1]	58720.0591	('1976-06-07 23:26:18.162','fc038af0-ba31-8fdc-1847-37328ef161b0')
-[1]	-18736.7874	('1977-03-10 04:41:16.215','3259d377-a92d-3557-9045-4ad1294d55d5')
-[34,-10]	-99367.9009	('2031-05-08 10:00:41.084','0b38ebc5-20a6-be3d-8543-23ce3546f49c')
-[110]	31562.7502	('2045-02-27 11:46:14.976','74116384-cb3e-eb00-0102-fb30ddea5d5f')
-[114]	-84125.1554	('2023-06-06 06:55:06.492','bf9ab359-ef9f-ad11-7e6c-160368b1e5ea')
-[124]	-114719.5228	('2010-11-11 22:57:23.722','c1046ffb-3415-cc3a-509a-e0005856d7d7')
+[]	-27467.1221	('2021-03-08 00:39:14.331','08ec773f-cded-8c46-727f-954768082cbf')
+[]	204013.7193	('2026-05-05 02:20:23.160','30f6d580-cb25-8d4f-f869-fc10128b3389')
+[-122]	-9432.2617	('2001-08-23 04:05:41.222','f7bf2154-78c3-8920-e4d3-a374e22998a4')
+[-30,61]	-133488.2399	('2048-05-14 06:05:06.021','a6af106c-b321-978b-fa79-338c9e342b5a')
+[-1]	58720.0591	('1976-06-07 20:26:18.162','fc038af0-ba31-8fdc-1847-37328ef161b0')
+[1]	-18736.7874	('1977-03-10 01:41:16.215','3259d377-a92d-3557-9045-4ad1294d55d5')
+[34,-10]	-99367.9009	('2031-05-08 07:00:41.084','0b38ebc5-20a6-be3d-8543-23ce3546f49c')
+[110]	31562.7502	('2045-02-27 08:46:14.976','74116384-cb3e-eb00-0102-fb30ddea5d5f')
+[114]	-84125.1554	('2023-06-06 03:55:06.492','bf9ab359-ef9f-ad11-7e6c-160368b1e5ea')
+[124]	-114719.5228	('2010-11-11 19:57:23.722','c1046ffb-3415-cc3a-509a-e0005856d7d7')
 -
-[]	1900051923	{	-189530.5846	h	-5.6279699579452485e47	('1984-12-06','2028-08-17 06:05:01','2036-04-02 23:52:28.468','4b3d498c-dd44-95c1-5b75-921504ec5d8d')	F743
-[-102,-118]	392272782	Eb	-14818.02	o	-2.664492247169164e59	('2082-12-26','2052-09-09 06:50:50','2088-04-21 05:07:08.245','aeb9c26e-0ee7-2b8e-802b-2a96319b8e60')	CBF4
-[-71]	775049089	\N	-158115.1178	w	4.1323844687113747e-305	('2108-04-19','2090-07-31 16:45:26','2076-07-10 09:11:06.385','57c69bc6-dddd-0975-e932-a7b5173a1304')	EB1D
-[-28,100]	3675466147	{	-146685.1749	h	3.6676044396877755e142	('2017-10-25','2100-02-28 18:07:18','2055-10-14 06:36:20.056','14949dae-dfa8-a124-af83-887348b2f609')	6D88
-[-23]	2514120753	(`u,	-119659.6174	w	1.3231258347475906e34	('2141-04-06','2074-08-10 06:25:12','1976-12-04 18:31:55.745','86a9b3c1-4593-4d56-7762-3aa1dd22cbbf')	AD43
-[11,-36]	3308237300	\N	171205.1896	\N	5.634708707075817e195	('1974-10-31','1993-12-24 09:38:45','2038-07-15 05:22:51.805','63d999b8-8cca-e237-c4a4-4dd7d0096f65')	609E
-[39]	1614362420	`4A8P	157144.063	o	-1.1843143253872814e-255	('2147-08-18','2072-09-28 18:27:27','2073-07-10 12:19:58.146','6483f5c0-8733-364c-4fa0-9948d32e8903')	A886
-[48,-120]	3848918261	1<Lu3	91487.2852	h	-1.9300793134783347e263	('2050-12-04','2076-04-05 09:33:05','2103-12-13 23:48:44.066','e522b794-b8fa-3f11-003b-3b6b088ff941')	556E
-[55]	3047524030	li&lF	93462.3661	h	2.8979254388809897e54	('1976-01-10','1987-07-14 00:25:51','2021-11-19 04:44:08.986','486e5b26-5fe8-fe3e-12ef-09aee40643e0')	9E75
-[100,-42]	3999367674		-112975.9852	h	2.658098863752086e-160	('2081-05-13','2071-08-07 13:34:33','1980-11-11 12:00:44.669','9754e8ac-5145-befb-63d9-a12dd1cf1f3a')	DF63
+[]	1900051923	{	-189530.5846	h	-5.6279699579452485e47	('1984-12-06','2028-08-17 03:05:01','2036-04-02 20:52:28.468','4b3d498c-dd44-95c1-5b75-921504ec5d8d')	F743
+[-102,-118]	392272782	Eb	-14818.02	o	-2.664492247169164e59	('2082-12-26','2052-09-09 03:50:50','2088-04-21 02:07:08.245','aeb9c26e-0ee7-2b8e-802b-2a96319b8e60')	CBF4
+[-71]	775049089	\N	-158115.1178	w	4.1323844687113747e-305	('2108-04-19','2090-07-31 13:45:26','2076-07-10 06:11:06.385','57c69bc6-dddd-0975-e932-a7b5173a1304')	EB1D
+[-28,100]	3675466147	{	-146685.1749	h	3.6676044396877755e142	('2017-10-25','2100-02-28 15:07:18','2055-10-14 03:36:20.056','14949dae-dfa8-a124-af83-887348b2f609')	6D88
+[-23]	2514120753	(`u,	-119659.6174	w	1.3231258347475906e34	('2141-04-06','2074-08-10 03:25:12','1976-12-04 15:31:55.745','86a9b3c1-4593-4d56-7762-3aa1dd22cbbf')	AD43
+[11,-36]	3308237300	\N	171205.1896	\N	5.634708707075817e195	('1974-10-31','1993-12-24 06:38:45','2038-07-15 02:22:51.805','63d999b8-8cca-e237-c4a4-4dd7d0096f65')	609E
+[39]	1614362420	`4A8P	157144.063	o	-1.1843143253872814e-255	('2147-08-18','2072-09-28 15:27:27','2073-07-10 09:19:58.146','6483f5c0-8733-364c-4fa0-9948d32e8903')	A886
+[48,-120]	3848918261	1<Lu3	91487.2852	h	-1.9300793134783347e263	('2050-12-04','2076-04-05 06:33:05','2103-12-13 20:48:44.066','e522b794-b8fa-3f11-003b-3b6b088ff941')	556E
+[55]	3047524030	li&lF	93462.3661	h	2.8979254388809897e54	('1976-01-10','1987-07-13 20:25:51','2021-11-19 01:44:08.986','486e5b26-5fe8-fe3e-12ef-09aee40643e0')	9E75
+[100,-42]	3999367674		-112975.9852	h	2.658098863752086e-160	('2081-05-13','2071-08-07 10:34:33','1980-11-11 09:00:44.669','9754e8ac-5145-befb-63d9-a12dd1cf1f3a')	DF63
 -
diff --git a/tests/queries/0_stateless/01087_table_function_generate.sql b/tests/queries/0_stateless/01087_table_function_generate.sql
index ef4311649f7..10657dbd63a 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.sql
+++ b/tests/queries/0_stateless/01087_table_function_generate.sql
@@ -42,20 +42,20 @@ LIMIT 10;
 SELECT '-';
 SELECT
 toTypeName(d), toTypeName(dt), toTypeName(dtm)
-FROM generateRandom('d Date, dt DateTime(\'Europe/Moscow\'), dtm DateTime(\'Europe/Moscow\')')
+FROM generateRandom('d Date, dt DateTime(\'UTC\'), dtm DateTime(\'UTC\')')
 LIMIT 1;
 SELECT
 d, dt, dtm
-FROM generateRandom('d Date, dt DateTime(\'Europe/Moscow\'), dtm DateTime(\'Europe/Moscow\')', 1, 10, 10)
+FROM generateRandom('d Date, dt DateTime(\'UTC\'), dtm DateTime(\'UTC\')', 1, 10, 10)
 LIMIT 10;
 SELECT '-';
 SELECT
 toTypeName(dt64), toTypeName(dts64), toTypeName(dtms64)
-FROM generateRandom('dt64 DateTime64(3, \'Europe/Moscow\'), dts64 DateTime64(6, \'Europe/Moscow\'), dtms64 DateTime64(6 ,\'Europe/Moscow\')')
+FROM generateRandom('dt64 DateTime64(3, \'UTC\'), dts64 DateTime64(6, \'UTC\'), dtms64 DateTime64(6 ,\'UTC\')')
 LIMIT 1;
 SELECT
 dt64, dts64, dtms64
-FROM generateRandom('dt64 DateTime64(3, \'Europe/Moscow\'), dts64 DateTime64(6, \'Europe/Moscow\'), dtms64 DateTime64(6 ,\'Europe/Moscow\')', 1, 10, 10)
+FROM generateRandom('dt64 DateTime64(3, \'UTC\'), dts64 DateTime64(6, \'UTC\'), dtms64 DateTime64(6 ,\'UTC\')', 1, 10, 10)
 LIMIT 10;
 SELECT
 toTypeName(d32)
@@ -176,8 +176,8 @@ FROM generateRandom('i String', 1, 10, 10)
 LIMIT 10;
 SELECT '-';
 DROP TABLE IF EXISTS test_table;
-CREATE TABLE test_table(a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3, 'Europe/Moscow'), UUID)) ENGINE=Memory;
-INSERT INTO test_table SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3, \'Europe/Moscow\'), UUID)', 1, 10, 2)
+CREATE TABLE test_table(a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3, 'UTC'), UUID)) ENGINE=Memory;
+INSERT INTO test_table SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(3, \'UTC\'), UUID)', 1, 10, 2)
 LIMIT 10;
 
 SELECT * FROM test_table ORDER BY a, d, c;
@@ -187,12 +187,11 @@ DROP TABLE IF EXISTS test_table;
 SELECT '-';
 
 DROP TABLE IF EXISTS test_table_2;
-CREATE TABLE test_table_2(a Array(Int8), b UInt32, c Nullable(String), d Decimal32(4), e Nullable(Enum16('h' = 1, 'w' = 5 , 'o' = -200)), f Float64, g Tuple(Date, DateTime('Europe/Moscow'), DateTime64(3, 'Europe/Moscow'), UUID), h FixedString(2)) ENGINE=Memory;
-INSERT INTO test_table_2 SELECT * FROM generateRandom('a Array(Int8), b UInt32, c Nullable(String), d Decimal32(4), e Nullable(Enum16(\'h\' = 1, \'w\' = 5 , \'o\' = -200)), f Float64, g Tuple(Date, DateTime(\'Europe/Moscow\'), DateTime64(3, \'Europe/Moscow\'), UUID), h FixedString(2)', 10, 5, 3)
+CREATE TABLE test_table_2(a Array(Int8), b UInt32, c Nullable(String), d Decimal32(4), e Nullable(Enum16('h' = 1, 'w' = 5 , 'o' = -200)), f Float64, g Tuple(Date, DateTime('UTC'), DateTime64(3, 'UTC'), UUID), h FixedString(2)) ENGINE=Memory;
+INSERT INTO test_table_2 SELECT * FROM generateRandom('a Array(Int8), b UInt32, c Nullable(String), d Decimal32(4), e Nullable(Enum16(\'h\' = 1, \'w\' = 5 , \'o\' = -200)), f Float64, g Tuple(Date, DateTime(\'UTC\'), DateTime64(3, \'UTC\'), UUID), h FixedString(2)', 10, 5, 3)
 LIMIT 10;
 
 SELECT a, b, c, d, e, f, g, hex(h) FROM test_table_2 ORDER BY a, b, c, d, e, f, g, h;
 SELECT '-';
 
 DROP TABLE IF EXISTS test_table_2;
-
diff --git a/tests/queries/0_stateless/01098_msgpack_format.reference b/tests/queries/0_stateless/01098_msgpack_format.reference
index 384852f24a7..cfe3501cb88 100644
--- a/tests/queries/0_stateless/01098_msgpack_format.reference
+++ b/tests/queries/0_stateless/01098_msgpack_format.reference
@@ -1,9 +1,9 @@
 255	65535	4294967295	100000000000	-128	-32768	-2147483648	-100000000000	2.02	10000.0000001	String	2021-12-19	2021-12-19 03:00:00	2021-12-19 03:00:00.000	[1,2,3,4,5]
 4	1234	3244467295	500000000000	-1	-256	-14741221	-7000000000	100.1	14321.032141201	Another string	2024-10-04	2028-04-21 01:20:00	2021-12-19 03:14:51.123	[5,4,3,2,1]
-42	42	42	42	42	42	42	42	42.42	42.42	42	1970-02-12	1970-01-01 03:00:42	1970-01-01 03:00:00.042	[42]
+42	42	42	42	42	42	42	42	42.42	42.42	42	1970-02-12	1970-01-01 02:00:42	1970-01-01 02:00:00.042	[42]
 255	65535	4294967295	100000000000	-128	-32768	-2147483648	-100000000000	2.02	10000.0000001	String	2021-12-19	2021-12-19 03:00:00	2021-12-19 03:00:00.000	[1,2,3,4,5]
 4	1234	3244467295	500000000000	-1	-256	-14741221	-7000000000	100.1	14321.032141201	Another string	2024-10-04	2028-04-21 01:20:00	2021-12-19 03:14:51.123	[5,4,3,2,1]
-42	42	42	42	42	42	42	42	42.42	42.42	42	1970-02-12	1970-01-01 03:00:42	1970-01-01 03:00:00.042	[42]
+42	42	42	42	42	42	42	42	42.42	42.42	42	1970-02-12	1970-01-01 02:00:42	1970-01-01 02:00:00.042	[42]
 [[1,2,3],[1001,2002],[3167]]	[[['one'],['two']],[['three']],[['four'],['five']]]
 [[1,2,3],[1001,2002],[3167]]	[[['one'],['two']],[['three']],[['four'],['five']]]
 [0,1,2,3,42,253,254,255]
diff --git a/tests/queries/0_stateless/01098_msgpack_format.sh b/tests/queries/0_stateless/01098_msgpack_format.sh
index aa982c5478d..24638f33324 100755
--- a/tests/queries/0_stateless/01098_msgpack_format.sh
+++ b/tests/queries/0_stateless/01098_msgpack_format.sh
@@ -11,7 +11,7 @@ USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonex
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS msgpack";
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime('Europe/Moscow'), datetime64 DateTime64(3, 'Europe/Moscow'), array Array(UInt32)) ENGINE = Memory";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime('Asia/Istanbul'), datetime64 DateTime64(3, 'Asia/Istanbul'), array Array(UInt32)) ENGINE = Memory";
 
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO msgpack VALUES (255, 65535, 4294967295, 100000000000, -128, -32768, -2147483648, -100000000000, 2.02, 10000.0000001, 'String', 18980, 1639872000, 1639872000000, [1,2,3,4,5]), (4, 1234, 3244467295, 500000000000, -1, -256, -14741221, -7000000000, 100.1, 14321.032141201, 'Another string', 20000, 1839882000, 1639872891123, [5,4,3,2,1]), (42, 42, 42, 42, 42, 42, 42, 42, 42.42, 42.42, '42', 42, 42, 42, [42])";
diff --git a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
index d73ce1aeef4..95f8dfc0377 100755
--- a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+++ b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
@@ -9,53 +9,54 @@ set -e
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT -q "INSERT INTO concurrent_optimize_table SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(10000)"
+    while true; do
+        $CLICKHOUSE_CLIENT -q "INSERT INTO concurrent_optimize_table SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(10000)";
+    done
 }
 
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE concurrent_optimize_table FINAL"
-    sleep 0.$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE concurrent_optimize_table FINAL";
+        sleep 0.$RANDOM;
+    done
 }
 
 function thread3()
 {
-    $CLICKHOUSE_CLIENT -mn -q "
-        DROP TABLE IF EXISTS concurrent_optimize_table;
-        CREATE TABLE concurrent_optimize_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16))
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_optimize_table', '1')
-        ORDER BY a
-        PARTITION BY b % 10
-        SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
-    sleep 0.$RANDOM
-    sleep 0.$RANDOM
-    sleep 0.$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS concurrent_optimize_table;
+            CREATE TABLE concurrent_optimize_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/concurrent_optimize_table', '1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+        sleep 0.$RANDOM;
+        sleep 0.$RANDOM;
+        sleep 0.$RANDOM;
+    done
 }
 
 
-export -f thread1
-export -f thread2
-export -f thread3
+export -f thread1;
+export -f thread2;
+export -f thread3;
 
 
 TIMEOUT=15
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread3 2> /dev/null &
+timeout $TIMEOUT bash -c thread1 2> /dev/null &
+timeout $TIMEOUT bash -c thread2 2> /dev/null &
+timeout $TIMEOUT bash -c thread3 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
index a51e786b058..e6b145aa57c 100755
--- a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
+++ b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
@@ -14,41 +14,46 @@ done
 
 function rename_thread_1()
 {
-    $CLICKHOUSE_CLIENT -q "RENAME TABLE replica_01108_1 TO replica_01108_1_tmp,
-                                        replica_01108_2 TO replica_01108_2_tmp,
-                                        replica_01108_3 TO replica_01108_3_tmp,
-                                        replica_01108_4 TO replica_01108_4_tmp"
-    sleep 0.$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT -q "RENAME TABLE replica_01108_1 TO replica_01108_1_tmp,
+                                            replica_01108_2 TO replica_01108_2_tmp,
+                                            replica_01108_3 TO replica_01108_3_tmp,
+                                            replica_01108_4 TO replica_01108_4_tmp";
+        sleep 0.$RANDOM;
+    done
 }
 
 function rename_thread_2()
 {
-    $CLICKHOUSE_CLIENT -q "RENAME TABLE replica_01108_1_tmp TO replica_01108_2,
-                                        replica_01108_2_tmp TO replica_01108_3,
-                                        replica_01108_3_tmp TO replica_01108_4,
-                                        replica_01108_4_tmp TO replica_01108_1"
-    sleep 0.$RANDOM
+    while true; do
+        $CLICKHOUSE_CLIENT -q "RENAME TABLE replica_01108_1_tmp TO replica_01108_2,
+                                            replica_01108_2_tmp TO replica_01108_3,
+                                            replica_01108_3_tmp TO replica_01108_4,
+                                            replica_01108_4_tmp TO replica_01108_1";
+        sleep 0.$RANDOM;
+    done
 }
 
 function restart_replicas_loop()
 {
-    for i in $(seq 4); do
-        $CLICKHOUSE_CLIENT -q "SYSTEM RESTART REPLICA replica_01108_${i}"
-        $CLICKHOUSE_CLIENT -q "SYSTEM RESTART REPLICA replica_01108_${i}_tmp"
+    while true; do
+        for i in $(seq 4); do
+            $CLICKHOUSE_CLIENT -q "SYSTEM RESTART REPLICA replica_01108_${i}";
+            $CLICKHOUSE_CLIENT -q "SYSTEM RESTART REPLICA replica_01108_${i}_tmp";
+        done
+        sleep 0.$RANDOM;
     done
-    sleep 0.$RANDOM
 }
 
-export -f rename_thread_1
-export -f rename_thread_2
+export -f rename_thread_1;
+export -f rename_thread_2;
 export -f restart_replicas_loop
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT rename_thread_1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT rename_thread_2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT restart_replicas_loop 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT restart_replicas_loop 2> /dev/null &
+timeout $TIMEOUT bash -c rename_thread_1 2> /dev/null &
+timeout $TIMEOUT bash -c rename_thread_2 2> /dev/null &
+timeout $TIMEOUT bash -c restart_replicas_loop 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01133_begin_commit_race.sh b/tests/queries/0_stateless/01133_begin_commit_race.sh
index f64570950c7..7dadb35ccff 100755
--- a/tests/queries/0_stateless/01133_begin_commit_race.sh
+++ b/tests/queries/0_stateless/01133_begin_commit_race.sh
@@ -13,32 +13,40 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE mt (n Int64) ENGINE=MergeTree ORDER BY
 
 function begin_commit_readonly()
 {
+  while true; do
     $CLICKHOUSE_CLIENT --multiquery --query "
             SET wait_changes_become_visible_after_commit_mode='wait';
             BEGIN TRANSACTION;
             COMMIT;" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_STATUS_OF_TRANSACTION
+  done
 }
 
 function begin_rollback_readonly()
 {
+  while true; do
     $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=wait_unknown --multiquery --query "
             BEGIN TRANSACTION;
             SET TRANSACTION SNAPSHOT 42;
             ROLLBACK;"
+  done
 }
 
 function begin_insert_commit()
 {
+  while true; do
     $CLICKHOUSE_CLIENT --wait_changes_become_visible_after_commit_mode=async --multiquery --query "
             BEGIN TRANSACTION;
             INSERT INTO mt VALUES ($RANDOM);
             COMMIT;" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_STATUS_OF_TRANSACTION
+  done
 }
 
 function introspection()
 {
+  while true; do
     $CLICKHOUSE_CLIENT -q "SELECT * FROM system.transactions FORMAT Null"
     $CLICKHOUSE_CLIENT -q "SELECT transactionLatestSnapshot(), transactionOldestSnapshot() FORMAT Null"
+  done
 }
 
 export -f begin_commit_readonly
@@ -48,10 +56,10 @@ export -f introspection
 
 TIMEOUT=20
 
-clickhouse_client_loop_timeout $TIMEOUT begin_commit_readonly &
-clickhouse_client_loop_timeout $TIMEOUT begin_rollback_readonly &
-clickhouse_client_loop_timeout $TIMEOUT begin_insert_commit &
-clickhouse_client_loop_timeout $TIMEOUT introspection &
+timeout $TIMEOUT bash -c begin_commit_readonly &
+timeout $TIMEOUT bash -c begin_rollback_readonly &
+timeout $TIMEOUT bash -c begin_insert_commit &
+timeout $TIMEOUT bash -c introspection &
 
 wait
 
diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index 175df7fd9b9..50e6f91b49b 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -13,30 +13,31 @@ $CLICKHOUSE_CLIENT --query "CREATE DATABASE test_01150"
 $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01150.t1 (x UInt64, s Array(Nullable(String))) ENGINE = Memory"
 $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01150.t2 (x UInt64, s Array(Nullable(String))) ENGINE = Memory"
 
-function thread_detach_attach()
-{
-    $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 219' -e '(query: '
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 82' -e '(query: '
-    sleep 0.0$RANDOM
+function thread_detach_attach {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 219' -e '(query: '
+        sleep 0.0$RANDOM
+        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 82' -e '(query: '
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_rename()
-{
-    $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
-    sleep 0.0$RANDOM
+function thread_rename {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
+        sleep 0.0$RANDOM
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
+        sleep 0.0$RANDOM
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
+        sleep 0.0$RANDOM
+    done
 }
 
 export -f thread_detach_attach
 export -f thread_rename
 
-clickhouse_client_loop_timeout 20 thread_detach_attach &
-clickhouse_client_loop_timeout 20 thread_rename &
-
+timeout 20 bash -c "thread_detach_attach" &
+timeout 20 bash -c 'thread_rename' &
 wait
 sleep 1
 
diff --git a/tests/queries/0_stateless/01154_move_partition_long.sh b/tests/queries/0_stateless/01154_move_partition_long.sh
index 4a0ed7808da..7cefac28e22 100755
--- a/tests/queries/0_stateless/01154_move_partition_long.sh
+++ b/tests/queries/0_stateless/01154_move_partition_long.sh
@@ -26,85 +26,99 @@ wait
 
 #function create_drop_thread()
 #{
-#    REPLICA=$(($RANDOM % 16))
-#    $CLICKHOUSE_CLIENT -q "DROP TABLE src_$REPLICA;"
-#    arr=("$@")
-#    engine=${arr[$RANDOM % ${#arr[@]}]}
-#    $CLICKHOUSE_CLIENT -q "CREATE TABLE src_$REPLICA (p UInt64, k UInt64, v UInt64) ENGINE=$engine PARTITION BY p % 10 ORDER BY k"
-#    sleep 0.$RANDOM
+#    while true; do
+#        REPLICA=$(($RANDOM % 16))
+#        $CLICKHOUSE_CLIENT -q "DROP TABLE src_$REPLICA;"
+#        arr=("$@")
+#        engine=${arr[$RANDOM % ${#arr[@]}]}
+#        $CLICKHOUSE_CLIENT -q "CREATE TABLE src_$REPLICA (p UInt64, k UInt64, v UInt64) ENGINE=$engine PARTITION BY p % 10 ORDER BY k"
+#        sleep 0.$RANDOM;
+#    done
 #}
 
 function insert_thread()
 {
-    REPLICA=$(($RANDOM % 16))
-    LIMIT=$(($RANDOM % 100))
-    $CLICKHOUSE_CLIENT -q "INSERT INTO $1_$REPLICA SELECT * FROM generateRandom('p UInt64, k UInt64, v UInt64') LIMIT $LIMIT" 2>/dev/null
+    while true; do
+        REPLICA=$(($RANDOM % 16))
+        LIMIT=$(($RANDOM % 100))
+        $CLICKHOUSE_CLIENT -q "INSERT INTO $1_$REPLICA SELECT * FROM generateRandom('p UInt64, k UInt64, v UInt64') LIMIT $LIMIT" 2>/dev/null
+    done
 }
 
 function move_partition_src_dst_thread()
 {
-    FROM_REPLICA=$(($RANDOM % 16))
-    TO_REPLICA=$(($RANDOM % 16))
-    PARTITION=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE src_$FROM_REPLICA MOVE PARTITION $PARTITION TO TABLE dst_$TO_REPLICA" 2>/dev/null
-    sleep 0.$RANDOM
+    while true; do
+        FROM_REPLICA=$(($RANDOM % 16))
+        TO_REPLICA=$(($RANDOM % 16))
+        PARTITION=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE src_$FROM_REPLICA MOVE PARTITION $PARTITION TO TABLE dst_$TO_REPLICA" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
 }
 
 function replace_partition_src_src_thread()
 {
-    FROM_REPLICA=$(($RANDOM % 16))
-    TO_REPLICA=$(($RANDOM % 16))
-    PARTITION=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE src_$TO_REPLICA REPLACE PARTITION $PARTITION FROM src_$FROM_REPLICA" 2>/dev/null
-    sleep 0.$RANDOM
+    while true; do
+        FROM_REPLICA=$(($RANDOM % 16))
+        TO_REPLICA=$(($RANDOM % 16))
+        PARTITION=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE src_$TO_REPLICA REPLACE PARTITION $PARTITION FROM src_$FROM_REPLICA" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
 }
 
 function drop_partition_thread()
 {
-    REPLICA=$(($RANDOM % 16))
-    PARTITION=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE dst_$REPLICA DROP PARTITION $PARTITION" 2>/dev/null
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 16))
+        PARTITION=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE dst_$REPLICA DROP PARTITION $PARTITION" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
 }
 
 function optimize_thread()
 {
-    REPLICA=$(($RANDOM % 16))
-    TABLE="src"
-    if (( RANDOM % 2 )); then
-        TABLE="dst"
-    fi
-    $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE ${TABLE}_$REPLICA" 2>/dev/null
-    sleep 0.$RANDOM
+  while true; do
+        REPLICA=$(($RANDOM % 16))
+        TABLE="src"
+        if (( RANDOM % 2 )); then
+            TABLE="dst"
+        fi
+        $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE ${TABLE}_$REPLICA" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
 }
 
 function drop_part_thread()
 {
-    REPLICA=$(($RANDOM % 16))
-    part=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.parts WHERE active AND database='$CLICKHOUSE_DATABASE' and table='dst_$REPLICA' ORDER BY rand() LIMIT 1")
-    $CLICKHOUSE_CLIENT -q "ALTER TABLE dst_$REPLICA DROP PART '$part'" 2>/dev/null
-    sleep 0.$RANDOM
+    while true; do
+        REPLICA=$(($RANDOM % 16))
+        part=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.parts WHERE active AND database='$CLICKHOUSE_DATABASE' and table='dst_$REPLICA' ORDER BY rand() LIMIT 1")
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE dst_$REPLICA DROP PART '$part'" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
 }
 
 #export -f create_drop_thread;
-export -f insert_thread
-export -f move_partition_src_dst_thread
-export -f replace_partition_src_src_thread
-export -f drop_partition_thread
-export -f optimize_thread
-export -f drop_part_thread
+export -f insert_thread;
+export -f move_partition_src_dst_thread;
+export -f replace_partition_src_src_thread;
+export -f drop_partition_thread;
+export -f optimize_thread;
+export -f drop_part_thread;
 
 TIMEOUT=60
 
-#clickhouse_client_loop_timeout $TIMEOUT "create_drop_thread ${engines[@]}" &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread src &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread src &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread dst &
-clickhouse_client_loop_timeout $TIMEOUT move_partition_src_dst_thread &
-clickhouse_client_loop_timeout $TIMEOUT replace_partition_src_src_thread &
-clickhouse_client_loop_timeout $TIMEOUT drop_partition_thread &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread &
-clickhouse_client_loop_timeout $TIMEOUT drop_part_thread &
+#timeout $TIMEOUT bash -c "create_drop_thread ${engines[@]}" &
+timeout $TIMEOUT bash -c 'insert_thread src' &
+timeout $TIMEOUT bash -c 'insert_thread src' &
+timeout $TIMEOUT bash -c 'insert_thread dst' &
+timeout $TIMEOUT bash -c move_partition_src_dst_thread &
+timeout $TIMEOUT bash -c replace_partition_src_src_thread &
+timeout $TIMEOUT bash -c drop_partition_thread &
+timeout $TIMEOUT bash -c optimize_thread &
+timeout $TIMEOUT bash -c drop_part_thread &
 wait
 
 check_replication_consistency "dst_" "count(), sum(p), sum(k), sum(v)"
diff --git a/tests/queries/0_stateless/01164_detach_attach_partition_race.sh b/tests/queries/0_stateless/01164_detach_attach_partition_race.sh
index 27658650b91..a7c87351ff4 100755
--- a/tests/queries/0_stateless/01164_detach_attach_partition_race.sh
+++ b/tests/queries/0_stateless/01164_detach_attach_partition_race.sh
@@ -12,30 +12,36 @@ $CLICKHOUSE_CLIENT -q "insert into mt values (3)"
 
 function thread_insert()
 {
-    $CLICKHOUSE_CLIENT -q "insert into mt values (rand())";
+    while true; do
+        $CLICKHOUSE_CLIENT -q "insert into mt values (rand())";
+    done
 }
 
 function thread_detach_attach()
 {
-    $CLICKHOUSE_CLIENT -q "alter table mt detach partition id 'all'";
-    $CLICKHOUSE_CLIENT -q "alter table mt attach partition id 'all'";
+    while true; do
+        $CLICKHOUSE_CLIENT -q "alter table mt detach partition id 'all'";
+        $CLICKHOUSE_CLIENT -q "alter table mt attach partition id 'all'";
+    done
 }
 
 function thread_drop_detached()
 {
-    $CLICKHOUSE_CLIENT --allow_drop_detached -q "alter table mt drop detached partition id 'all'";
+    while true; do
+        $CLICKHOUSE_CLIENT --allow_drop_detached -q "alter table mt drop detached partition id 'all'";
+    done
 }
 
-export -f thread_insert
-export -f thread_detach_attach
-export -f thread_drop_detached
+export -f thread_insert;
+export -f thread_detach_attach;
+export -f thread_drop_detached;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread_insert &
-clickhouse_client_loop_timeout $TIMEOUT thread_detach_attach 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread_detach_attach 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT thread_drop_detached 2> /dev/null &
+timeout $TIMEOUT bash -c thread_insert &
+timeout $TIMEOUT bash -c thread_detach_attach 2> /dev/null &
+timeout $TIMEOUT bash -c thread_detach_attach 2> /dev/null &
+timeout $TIMEOUT bash -c thread_drop_detached 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
index 9fef47c8d5d..653333dcb96 100755
--- a/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
+++ b/tests/queries/0_stateless/01169_alter_partition_isolation_stress.sh
@@ -73,6 +73,7 @@ function thread_partition_dst_to_src()
         $CLICKHOUSE_CLIENT --multiquery --query "
         SYSTEM STOP MERGES dst;
         ALTER TABLE dst DROP PARTITION ID 'nonexistent';  -- STOP MERGES doesn't wait for started merges to finish, so we use this trick
+        SYSTEM SYNC TRANSACTION LOG;
         BEGIN TRANSACTION;
         INSERT INTO dst VALUES /* ($i, 4) */ ($i, 4);
         INSERT INTO src SELECT * FROM dst;
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index e632841bd01..e4a23055ae6 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -36,7 +36,7 @@ function run_until_out_contains()
 RAND_COMMENT="01175_DDL_$RANDOM"
 LOG_COMMENT="${CLICKHOUSE_LOG_COMMENT}_$RAND_COMMENT"
 
-CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment ${CLICKHOUSE_LOG_COMMENT}/--log_comment ${LOG_COMMENT}}
+CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment=\'${CLICKHOUSE_LOG_COMMENT}\'/--log_comment=\'${LOG_COMMENT}\'}
 CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 "
 CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --distributed_ddl_entry_format_version=2 "
 
diff --git a/tests/queries/0_stateless/01186_conversion_to_nullable.reference b/tests/queries/0_stateless/01186_conversion_to_nullable.reference
index dc77029ec3b..86fa0afff20 100644
--- a/tests/queries/0_stateless/01186_conversion_to_nullable.reference
+++ b/tests/queries/0_stateless/01186_conversion_to_nullable.reference
@@ -15,13 +15,13 @@
 2149-06-06
 2020-12-24 01:02:03
 \N
-1970-01-01 03:00:00
+1970-01-01 02:00:00
 \N
 2020-12-24 01:02:03.00
 \N
-1970-01-01 03:00:00.00
-1970-01-01 03:00:00.00
-946721532
+1970-01-01 02:00:00.00
+1970-01-01 02:00:00.00
+946725132
 \N
 \N
 42
diff --git a/tests/queries/0_stateless/01186_conversion_to_nullable.sql b/tests/queries/0_stateless/01186_conversion_to_nullable.sql
index 828d3cac05b..52f7ee91f52 100644
--- a/tests/queries/0_stateless/01186_conversion_to_nullable.sql
+++ b/tests/queries/0_stateless/01186_conversion_to_nullable.sql
@@ -2,9 +2,9 @@ select toUInt8(x) from values('x Nullable(String)', '42', NULL, '0', '', '256');
 select toInt64(x) from values('x Nullable(String)', '42', NULL, '0', '', '256');
 
 select toDate(x) from values('x Nullable(String)', '2020-12-24', NULL, '0000-00-00', '', '9999-01-01');
-select toDateTime(x, 'Europe/Moscow') from values('x Nullable(String)', '2020-12-24 01:02:03', NULL, '0000-00-00 00:00:00', '');
-select toDateTime64(x, 2, 'Europe/Moscow') from values('x Nullable(String)', '2020-12-24 01:02:03', NULL, '0000-00-00 00:00:00', '');
-select toUnixTimestamp(x, 'Europe/Moscow') from values ('x Nullable(String)', '2000-01-01 13:12:12', NULL, '');
+select toDateTime(x, 'Asia/Istanbul') from values('x Nullable(String)', '2020-12-24 01:02:03', NULL, '0000-00-00 00:00:00', '');
+select toDateTime64(x, 2, 'Asia/Istanbul') from values('x Nullable(String)', '2020-12-24 01:02:03', NULL, '0000-00-00 00:00:00', '');
+select toUnixTimestamp(x, 'Asia/Istanbul') from values ('x Nullable(String)', '2000-01-01 13:12:12', NULL, '');
 
 select toDecimal32(x, 2) from values ('x Nullable(String)', '42', NULL, '3.14159');
 select toDecimal64(x, 8) from values ('x Nullable(String)', '42', NULL, '3.14159');
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
index a831fd18bfe..c5c1f2ebfd3 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
@@ -14,7 +14,7 @@ ENGINE = MergeTree()
 PARTITION BY date
 ORDER BY key;
 
-INSERT INTO table_rename_with_default (date, key, value1) SELECT toDateTime(toDate('2019-10-01') + number % 3, 'Europe/Moscow'), number, toString(number)  from numbers(9);
+INSERT INTO table_rename_with_default (date, key, value1) SELECT toDateTime(toDate('2019-10-01') + number % 3, 'Asia/Istanbul'), number, toString(number)  from numbers(9);
 
 SELECT * FROM table_rename_with_default WHERE key = 1 FORMAT TSVWithNames;
 
@@ -44,7 +44,7 @@ ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01213/table_rename_wit
 ORDER BY tuple()
 TTL date2 + INTERVAL 500 MONTH;
 
-INSERT INTO table_rename_with_ttl SELECT toDateTime(toDate('2019-10-01') + number % 3, 'Europe/Moscow'), toDateTime(toDate('2018-10-01') + number % 3, 'Europe/Moscow'), toString(number), toString(number) from numbers(9);
+INSERT INTO table_rename_with_ttl SELECT toDateTime(toDate('2019-10-01') + number % 3, 'Asia/Istanbul'), toDateTime(toDate('2018-10-01') + number % 3, 'Asia/Istanbul'), toString(number), toString(number) from numbers(9);
 
 SELECT * FROM table_rename_with_ttl WHERE value1 = '1' FORMAT TSVWithNames;
 
diff --git a/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.reference b/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.reference
index 569b21af197..57eebd45287 100644
--- a/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.reference
+++ b/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.reference
@@ -4,40 +4,40 @@ SELECT * FROM tt_m order by a;
 2	4
 3	4
 5	12
-SELECT * FROM tt_m WHERE b != 0 order by b;
+SELECT * FROM tt_m WHERE b != 0 order by b, a;
 1	1
 2	4
 3	4
 5	12
-SELECT * FROM tt_m WHERE b != 1 order by b;
+SELECT * FROM tt_m WHERE b != 1 order by b, a;
 2	4
 3	4
 5	12
-SELECT * FROM tt_m WHERE b != a * 2 order by b;
+SELECT * FROM tt_m WHERE b != a * 2 order by b, a;
 1	1
 3	4
 5	12
-SELECT * FROM tt_m WHERE b / 2 != a order by b;
+SELECT * FROM tt_m WHERE b / 2 != a order by b, a;
 1	1
 3	4
 5	12
-SELECT b FROM tt_m WHERE b >= 0 order by b;
+SELECT b FROM tt_m WHERE b >= 0 order by b, a;
 1
 4
 4
 12
 SELECT b FROM tt_m WHERE b == 12;
 12
-SELECT b FROM tt_m ORDER BY b;
+SELECT b FROM tt_m ORDER BY b, a;
 1
 4
 4
 12
-SELECT b, count()  FROM tt_m GROUP BY b order by b;
+SELECT b, count() FROM tt_m GROUP BY b order by b;
 1	1
 4	2
 12	1
-SELECT b FROM tt_m  order by b LIMIT 1 BY b;
+SELECT b FROM tt_m order by b LIMIT 1 BY b;
 1
 4
 12
@@ -47,7 +47,8 @@ SELECT max(a) FROM tt_m group by b order by b;
 1
 3
 5
-SELECT a FROM tt_m order by b LIMIT 1 BY b;
+SELECT a FROM tt_m order by b, a;
 1
 2
+3
 5
diff --git a/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.sql b/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.sql
index 20a22eb48b1..61c7fe3681e 100644
--- a/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.sql
+++ b/tests/queries/0_stateless/01214_test_storage_merge_aliases_with_where.sql
@@ -17,18 +17,17 @@ INSERT INTO tt4 VALUES (5);
 
 -- { echo  }
 SELECT * FROM tt_m order by a;
-SELECT * FROM tt_m WHERE b != 0 order by b;
-SELECT * FROM tt_m WHERE b != 1 order by b;
-SELECT * FROM tt_m WHERE b != a * 2 order by b;
-SELECT * FROM tt_m WHERE b / 2 != a order by b;
+SELECT * FROM tt_m WHERE b != 0 order by b, a;
+SELECT * FROM tt_m WHERE b != 1 order by b, a;
+SELECT * FROM tt_m WHERE b != a * 2 order by b, a;
+SELECT * FROM tt_m WHERE b / 2 != a order by b, a;
 
-SELECT b FROM tt_m WHERE b >= 0 order by b;
+SELECT b FROM tt_m WHERE b >= 0 order by b, a;
 SELECT b FROM tt_m WHERE b == 12;
-SELECT b FROM tt_m ORDER BY b;
-SELECT b, count()  FROM tt_m GROUP BY b order by b;
-SELECT b FROM tt_m  order by b LIMIT 1 BY b;
+SELECT b FROM tt_m ORDER BY b, a;
+SELECT b, count() FROM tt_m GROUP BY b order by b;
+SELECT b FROM tt_m order by b LIMIT 1 BY b;
 
 SELECT a FROM tt_m WHERE b = 12;
 SELECT max(a) FROM tt_m group by b order by b;
-SELECT a FROM tt_m order by b LIMIT 1 BY b;
-
+SELECT a FROM tt_m order by b, a;
diff --git a/tests/queries/0_stateless/01249_flush_interactive.sh b/tests/queries/0_stateless/01249_flush_interactive.sh
index 2ab85e2fb6c..89167002ed5 100755
--- a/tests/queries/0_stateless/01249_flush_interactive.sh
+++ b/tests/queries/0_stateless/01249_flush_interactive.sh
@@ -28,5 +28,3 @@ while true; do
     [[ $(test) == $(echo -ne "0\n1\n2\n3\n4\n---\n0\n1\n2\n3\n4\n---\n") ]] && break
     sleep 1
 done
-
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/01269_toStartOfSecond.sql b/tests/queries/0_stateless/01269_toStartOfSecond.sql
index b74eaabf351..641da4a15a9 100644
--- a/tests/queries/0_stateless/01269_toStartOfSecond.sql
+++ b/tests/queries/0_stateless/01269_toStartOfSecond.sql
@@ -4,7 +4,7 @@ SELECT toStartOfSecond(now());  -- {serverError 43}
 SELECT toStartOfSecond();   -- {serverError 42}
 SELECT toStartOfSecond(now64(), 123);   -- {serverError 43}
 
-WITH toDateTime64('2019-09-16 19:20:11', 3, 'Europe/Moscow') AS dt64 SELECT toStartOfSecond(dt64, 'UTC') AS res, toTypeName(res);
+WITH toDateTime64('2019-09-16 19:20:11', 3, 'Asia/Istanbul') AS dt64 SELECT toStartOfSecond(dt64, 'UTC') AS res, toTypeName(res);
 WITH toDateTime64('2019-09-16 19:20:11', 0, 'UTC') AS dt64 SELECT toStartOfSecond(dt64) AS res, toTypeName(res);
 WITH toDateTime64('2019-09-16 19:20:11.123', 3, 'UTC') AS dt64 SELECT toStartOfSecond(dt64) AS res, toTypeName(res);
 WITH toDateTime64('2019-09-16 19:20:11.123', 9, 'UTC') AS dt64 SELECT toStartOfSecond(dt64) AS res, toTypeName(res);
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index c50a911e371..b410595cf1d 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -113,6 +113,7 @@ SYSTEM SYNC REPLICA	['SYNC REPLICA']	TABLE	SYSTEM
 SYSTEM RESTART REPLICA	['RESTART REPLICA']	TABLE	SYSTEM
 SYSTEM RESTORE REPLICA	['RESTORE REPLICA']	TABLE	SYSTEM
 SYSTEM SYNC DATABASE REPLICA	['SYNC DATABASE REPLICA']	DATABASE	SYSTEM
+SYSTEM SYNC TRANSACTION LOG	['SYNC TRANSACTION LOG']	GLOBAL	SYSTEM
 SYSTEM FLUSH DISTRIBUTED	['FLUSH DISTRIBUTED']	TABLE	SYSTEM FLUSH
 SYSTEM FLUSH LOGS	['FLUSH LOGS']	GLOBAL	SYSTEM FLUSH
 SYSTEM FLUSH	[]	\N	SYSTEM
diff --git a/tests/queries/0_stateless/01273_arrow_load.sh b/tests/queries/0_stateless/01273_arrow_load.sh
index 2e213ce3a79..fa70255821a 100755
--- a/tests/queries/0_stateless/01273_arrow_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_load.sh
@@ -12,7 +12,7 @@ CB_DIR=$(dirname "$CLICKHOUSE_CLIENT_BINARY")
 DATA_FILE=$CUR_DIR/data_arrow/test.arrow
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS arrow_load"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE arrow_load (bool UInt8, int8 Int8, int16 Int16, int32 Int32, int64 Int64, uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, halffloat Float32, float Float32, double Float64, string String, date32 Date, date64 DateTime('Europe/Moscow'), timestamp DateTime('Europe/Moscow')) ENGINE = Memory"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE arrow_load (bool UInt8, int8 Int8, int16 Int16, int32 Int32, int64 Int64, uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, halffloat Float32, float Float32, double Float64, string String, date32 Date, date64 DateTime('Asia/Istanbul'), timestamp DateTime('Asia/Istanbul')) ENGINE = Memory"
 cat "$DATA_FILE"  | ${CLICKHOUSE_CLIENT} -q "insert into arrow_load format Arrow"
 ${CLICKHOUSE_CLIENT} --query="select * from arrow_load"
 
diff --git a/tests/queries/0_stateless/01277_toUnixTimestamp64.sql b/tests/queries/0_stateless/01277_toUnixTimestamp64.sql
index eb3e8c612ed..42de53beb66 100644
--- a/tests/queries/0_stateless/01277_toUnixTimestamp64.sql
+++ b/tests/queries/0_stateless/01277_toUnixTimestamp64.sql
@@ -12,22 +12,22 @@ SELECT toUnixTimestamp64Micro('abc', 123);  -- {serverError 42}
 SELECT toUnixTimestamp64Nano('abc', 123);  -- {serverError 42}
 
 SELECT 'const column';
-WITH toDateTime64('2019-09-16 19:20:12.345678910', 3, 'Europe/Moscow') AS dt64
+WITH toDateTime64('2019-09-16 19:20:12.345678910', 3, 'Asia/Istanbul') AS dt64
 SELECT dt64, toUnixTimestamp64Milli(dt64), toUnixTimestamp64Micro(dt64), toUnixTimestamp64Nano(dt64);
 
-WITH toDateTime64('2019-09-16 19:20:12.345678910', 6, 'Europe/Moscow') AS dt64
+WITH toDateTime64('2019-09-16 19:20:12.345678910', 6, 'Asia/Istanbul') AS dt64
 SELECT dt64, toUnixTimestamp64Milli(dt64), toUnixTimestamp64Micro(dt64), toUnixTimestamp64Nano(dt64);
 
-WITH toDateTime64('2019-09-16 19:20:12.345678910', 9, 'Europe/Moscow') AS dt64
+WITH toDateTime64('2019-09-16 19:20:12.345678910', 9, 'Asia/Istanbul') AS dt64
 SELECT dt64, toUnixTimestamp64Milli(dt64), toUnixTimestamp64Micro(dt64), toUnixTimestamp64Nano(dt64);
 
 SELECT 'non-const column';
-WITH toDateTime64('2019-09-16 19:20:12.345678910', 3, 'Europe/Moscow') AS x
+WITH toDateTime64('2019-09-16 19:20:12.345678910', 3, 'Asia/Istanbul') AS x
 SELECT materialize(x) as dt64, toUnixTimestamp64Milli(dt64), toUnixTimestamp64Micro(dt64), toUnixTimestamp64Nano(dt64);
 
-WITH toDateTime64('2019-09-16 19:20:12.345678910', 6, 'Europe/Moscow') AS x
+WITH toDateTime64('2019-09-16 19:20:12.345678910', 6, 'Asia/Istanbul') AS x
 SELECT materialize(x) as dt64, toUnixTimestamp64Milli(dt64), toUnixTimestamp64Micro(dt64), toUnixTimestamp64Nano(dt64);
 
-WITH toDateTime64('2019-09-16 19:20:12.345678910', 9, 'Europe/Moscow') AS x
+WITH toDateTime64('2019-09-16 19:20:12.345678910', 9, 'Asia/Istanbul') AS x
 SELECT materialize(x) as dt64, toUnixTimestamp64Milli(dt64), toUnixTimestamp64Micro(dt64), toUnixTimestamp64Nano(dt64);
 
diff --git a/tests/queries/0_stateless/01280_min_map_max_map.reference b/tests/queries/0_stateless/01280_min_map_max_map.reference
index 7bd7fb8d74a..612f95b7083 100644
--- a/tests/queries/0_stateless/01280_min_map_max_map.reference
+++ b/tests/queries/0_stateless/01280_min_map_max_map.reference
@@ -10,7 +10,7 @@
 ([1],[1])
 ([1],[1])
 (['1970-01-02'],[1])
-(['1970-01-01 03:00:01'],[1])
+(['1970-01-01 02:00:01'],[1])
 ([1.01],[1])
 (['a'],[1])
 (['01234567-89ab-cdef-0123-456789abcdef'],['02222222-89ab-cdef-0123-456789abcdef'])
@@ -19,7 +19,7 @@
 ([1],[2])
 ([1],[2])
 (['1970-01-02'],[2])
-(['1970-01-01 03:00:01'],[2])
+(['1970-01-01 02:00:01'],[2])
 ([1.01],[2])
 (['a'],[2])
 ([1,2],[0,0])
diff --git a/tests/queries/0_stateless/01280_min_map_max_map.sql b/tests/queries/0_stateless/01280_min_map_max_map.sql
index 96fdfc61929..9bc8c320d93 100644
--- a/tests/queries/0_stateless/01280_min_map_max_map.sql
+++ b/tests/queries/0_stateless/01280_min_map_max_map.sql
@@ -15,7 +15,7 @@ select minMap(val, cnt) from values ('val Array(FixedString(1)), cnt Array(Fixed
 select minMap(val, cnt) from values ('val Array(UInt64), cnt Array(UInt64)',  ([1], [1]), ([1], [2]));
 select minMap(val, cnt) from values ('val Array(Float64), cnt Array(Int8)',  ([1], [1]), ([1], [2]));
 select minMap(val, cnt) from values ('val Array(Date), cnt Array(Int16)',  ([1], [1]), ([1], [2]));
-select minMap(val, cnt) from values ('val Array(DateTime(\'Europe/Moscow\')), cnt Array(Int32)',  ([1], [1]), ([1], [2]));
+select minMap(val, cnt) from values ('val Array(DateTime(\'Asia/Istanbul\')), cnt Array(Int32)',  ([1], [1]), ([1], [2]));
 select minMap(val, cnt) from values ('val Array(Decimal(10, 2)), cnt Array(Int16)',  (['1.01'], [1]), (['1.01'], [2]));
 select minMap(val, cnt) from values ('val Array(Enum16(\'a\'=1)), cnt Array(Int16)',  (['a'], [1]), (['a'], [2]));
 
@@ -28,7 +28,7 @@ select maxMap(val, cnt) from values ('val Array(FixedString(1)), cnt Array(Fixed
 select maxMap(val, cnt) from values ('val Array(UInt64), cnt Array(UInt64)',  ([1], [1]), ([1], [2]));
 select maxMap(val, cnt) from values ('val Array(Float64), cnt Array(Int8)',  ([1], [1]), ([1], [2]));
 select maxMap(val, cnt) from values ('val Array(Date), cnt Array(Int16)',  ([1], [1]), ([1], [2]));
-select maxMap(val, cnt) from values ('val Array(DateTime(\'Europe/Moscow\')), cnt Array(Int32)',  ([1], [1]), ([1], [2]));
+select maxMap(val, cnt) from values ('val Array(DateTime(\'Asia/Istanbul\')), cnt Array(Int32)',  ([1], [1]), ([1], [2]));
 select maxMap(val, cnt) from values ('val Array(Decimal(10, 2)), cnt Array(Int16)',  (['1.01'], [1]), (['1.01'], [2]));
 select maxMap(val, cnt) from values ('val Array(Enum16(\'a\'=1)), cnt Array(Int16)',  (['a'], [1]), (['a'], [2]));
 
diff --git a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
index 1807da6948a..2f4164ee0d1 100755
--- a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
+++ b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-replicated-database, no-parallel, no-fasttest, no-tsan, no-asan, no-random-settings
+# Tags: no-replicated-database, no-parallel, no-fasttest, no-tsan, no-asan, no-random-settings, no-s3-storage
 # Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 # Regression for MemoryTracker that had been incorrectly accounted
diff --git a/tests/queries/0_stateless/01287_max_execution_speed.sql b/tests/queries/0_stateless/01287_max_execution_speed.sql
index 7dbeab2d635..6e6c71e445c 100644
--- a/tests/queries/0_stateless/01287_max_execution_speed.sql
+++ b/tests/queries/0_stateless/01287_max_execution_speed.sql
@@ -1,11 +1,11 @@
 -- Tags: no-fasttest
 
-SET min_execution_speed = 100000000000, timeout_before_checking_execution_speed = 0.1;
+SET min_execution_speed = 100000000000, timeout_before_checking_execution_speed = 0;
 SELECT count() FROM system.numbers; -- { serverError 160 }
 SELECT 'Ok (1)';
 SET min_execution_speed = 0;
 
-SET min_execution_speed_bytes = 800000000000, timeout_before_checking_execution_speed = 0.1;
+SET min_execution_speed_bytes = 800000000000, timeout_before_checking_execution_speed = 0;
 SELECT count() FROM system.numbers; -- { serverError 160 }
 SELECT 'Ok (2)';
 SET min_execution_speed_bytes = 0;
diff --git a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
index 8dcac23550d..d0dc554f425 100644
--- a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
+++ b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
@@ -1,7 +1,7 @@
 -- Tags: distributed
 
 SET max_execution_speed = 1000000;
-SET timeout_before_checking_execution_speed = 0.001;
+SET timeout_before_checking_execution_speed = 0;
 SET max_block_size = 100;
 
 SET log_queries=1;
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
index 1235e013ff7..3c11dc5f772 100755
--- a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
+++ b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
@@ -10,67 +10,94 @@ export CURR_DATABASE="test_lazy_01294_concurrent_${CLICKHOUSE_DATABASE}"
 
 function recreate_lazy_func1()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        DETACH TABLE $CURR_DATABASE.log;
-        ATTACH TABLE $CURR_DATABASE.log;
+    $CLICKHOUSE_CLIENT -q "
+        CREATE TABLE $CURR_DATABASE.log (a UInt64, b UInt64) ENGINE = Log;
     ";
+
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            DETACH TABLE $CURR_DATABASE.log;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            ATTACH TABLE $CURR_DATABASE.log;
+        ";
+        done
 }
 
 function recreate_lazy_func2()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        CREATE TABLE $CURR_DATABASE.tlog (a UInt64, b UInt64) ENGINE = TinyLog;
-        DROP TABLE $CURR_DATABASE.tlog;
-    "
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            CREATE TABLE $CURR_DATABASE.tlog (a UInt64, b UInt64) ENGINE = TinyLog;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            DROP TABLE $CURR_DATABASE.tlog;
+        ";
+        done
 }
 
 function recreate_lazy_func3()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        ATTACH TABLE $CURR_DATABASE.slog;
-        DETACH TABLE $CURR_DATABASE.slog;
-    "
+    $CLICKHOUSE_CLIENT -q "
+        CREATE TABLE $CURR_DATABASE.slog (a UInt64, b UInt64) ENGINE = StripeLog;
+    ";
+
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            ATTACH TABLE $CURR_DATABASE.slog;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            DETACH TABLE $CURR_DATABASE.slog;
+        ";
+        done
 }
 
 function recreate_lazy_func4()
 {
-    $CLICKHOUSE_CLIENT -nm -q "
-        CREATE TABLE $CURR_DATABASE.tlog2 (a UInt64, b UInt64) ENGINE = TinyLog;
-        DROP TABLE $CURR_DATABASE.tlog2;
-    "
+    while true; do
+        $CLICKHOUSE_CLIENT -q "
+            CREATE TABLE $CURR_DATABASE.tlog2 (a UInt64, b UInt64) ENGINE = TinyLog;
+        ";
+
+        $CLICKHOUSE_CLIENT -q "
+            DROP TABLE $CURR_DATABASE.tlog2;
+        ";
+        done
 }
 
 function test_func()
 {
-    for table in log tlog slog tlog2; do
-        $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES $CURR_DATABASE.$table" >& /dev/null
+    while true; do
+        for table in log tlog slog tlog2; do
+            $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES $CURR_DATABASE.$table" >& /dev/null
+        done
     done
 }
 
 
-export -f recreate_lazy_func1
-export -f recreate_lazy_func2
-export -f recreate_lazy_func3
-export -f recreate_lazy_func4
-export -f test_func
+export -f recreate_lazy_func1;
+export -f recreate_lazy_func2;
+export -f recreate_lazy_func3;
+export -f recreate_lazy_func4;
+export -f test_func;
 
 
 ${CLICKHOUSE_CLIENT} -n -q "
     DROP DATABASE IF EXISTS $CURR_DATABASE;
     CREATE DATABASE $CURR_DATABASE ENGINE = Lazy(1);
-
-    CREATE TABLE $CURR_DATABASE.log (a UInt64, b UInt64) ENGINE = Log;
-    CREATE TABLE $CURR_DATABASE.slog (a UInt64, b UInt64) ENGINE = StripeLog;
 "
 
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func1 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func2 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func3 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT recreate_lazy_func4 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT test_func 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func1 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func2 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func3 2> /dev/null &
+timeout $TIMEOUT bash -c recreate_lazy_func4 2> /dev/null &
+timeout $TIMEOUT bash -c test_func 2> /dev/null &
 
 wait
 sleep 1
diff --git a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
index ed7e5937bd0..010c66b9bb1 100755
--- a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
@@ -5,6 +5,15 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+function test()
+{
+    for _ in {1..1000}; do
+        $CLICKHOUSE_CLIENT --max_memory_usage 1G <<< "SELECT uniqExactState(number) FROM system.numbers_mt GROUP BY number % 10";
+    done
+}
+
+export -f test;
+
 # If the memory leak exists, it will lead to OOM fairly quickly.
-clickhouse_client_loop_timeout 30 $CLICKHOUSE_CLIENT --max_memory_usage 1G -q 'SELECT uniqExactState(number) FROM system.numbers_mt GROUP BY number % 10' 2>&1 | grep -o -F 'Memory limit (for query) exceeded' | uniq
+timeout 30 bash -c test 2>&1 | grep -o -F 'Memory limit (for query) exceeded' | uniq
 echo 'Ok'
diff --git a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
index 52b635fe5df..7e10ab475d4 100755
--- a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
@@ -7,10 +7,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function test()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT groupArrayIfState(('Hello, world' AS s) || s || s || s || s || s || s || s || s || s, NOT throwIf(number > 10000000, 'Ok')) FROM system.numbers_mt GROUP BY number % 10";
+    for _ in {1..250}; do
+        $CLICKHOUSE_CLIENT --query "SELECT groupArrayIfState(('Hello, world' AS s) || s || s || s || s || s || s || s || s || s, NOT throwIf(number > 10000000, 'Ok')) FROM system.numbers_mt GROUP BY number % 10";
+    done
 }
 
-export -f test
+export -f test;
 
 # If the memory leak exists, it will lead to OOM fairly quickly.
-clickhouse_client_loop_timeout 30 test 2>&1 | grep -o -F 'Ok' | uniq
+timeout 30 bash -c test 2>&1 | grep -o -F 'Ok' | uniq
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index 9b4159fa002..1d2d4516b9c 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -9,17 +9,20 @@ set -e
 
 function thread()
 {
-    $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
-        CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
-            grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|^\(query: '
+    while true; do
+        $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
+            CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
+                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|^\(query: '
+    done
 }
 
-export -f thread
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f thread;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread 1 &
-clickhouse_client_loop_timeout $TIMEOUT thread 2 &
+timeout $TIMEOUT bash -c 'thread 1' &
+timeout $TIMEOUT bash -c 'thread 2' &
 
 wait
 
diff --git a/tests/queries/0_stateless/01307_orc_output_format.reference b/tests/queries/0_stateless/01307_orc_output_format.reference
index e185c02a3e5..657d28b3093 100644
--- a/tests/queries/0_stateless/01307_orc_output_format.reference
+++ b/tests/queries/0_stateless/01307_orc_output_format.reference
@@ -1,6 +1,6 @@
 255	65535	4294967295	100000000000	-128	-32768	-2147483648	-100000000000	2.02	10000.0000001	String	2020	2021-12-19	2021-12-19 03:00:00	1.0001	1.00000001	100000.00000000000001	1
 4	1234	3244467295	500000000000	-1	-256	-14741221	-7000000000	100.1	14321.032141201	Another string	2000	2024-10-04	2028-04-21 01:20:00	34.1234	123123.123123123	123123123.123123123123123	\N
-42	42	42	42	42	42	42	42	42.42	42.42	42	4242	1970-02-12	1970-01-01 03:00:42	42.42	42.42424242	424242.42424242424242	42
+42	42	42	42	42	42	42	42	42.42	42.42	42	4242	1970-02-12	1970-01-01 02:00:42	42.42	42.42424242	424242.42424242424242	42
 255	65535	4294967295	100000000000	-128	-32768	-2147483648	-100000000000	2.02	10000.0000001	String	2020	2021-12-19	2021-12-19 03:00:00	1.0001	1.00000001	100000.00000000000001	1
 4	1234	3244467295	500000000000	-1	-256	-14741221	-7000000000	100.1	14321.032141201	Another string	2000	2024-10-04	2028-04-21 01:20:00	34.1234	123123.123123123	123123123.123123123123123	\N
-42	42	42	42	42	42	42	42	42.42	42.42	42	4242	1970-02-12	1970-01-01 03:00:42	42.42	42.42424242	424242.42424242424242	42
+42	42	42	42	42	42	42	42	42.42	42.42	42	4242	1970-02-12	1970-01-01 02:00:42	42.42	42.42424242	424242.42424242424242	42
diff --git a/tests/queries/0_stateless/01307_orc_output_format.sh b/tests/queries/0_stateless/01307_orc_output_format.sh
index 926398e55bd..b17792af051 100755
--- a/tests/queries/0_stateless/01307_orc_output_format.sh
+++ b/tests/queries/0_stateless/01307_orc_output_format.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS orc";
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE orc (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, fixed FixedString(4), date Date, datetime DateTime('Europe/Moscow'), decimal32 Decimal32(4), decimal64 Decimal64(10), decimal128 Decimal128(20), nullable Nullable(Int32)) ENGINE = Memory";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE orc (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, fixed FixedString(4), date Date, datetime DateTime('Asia/Istanbul'), decimal32 Decimal32(4), decimal64 Decimal64(10), decimal128 Decimal128(20), nullable Nullable(Int32)) ENGINE = Memory";
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO orc VALUES (255, 65535, 4294967295, 100000000000, -128, -32768, -2147483648, -100000000000, 2.02, 10000.0000001, 'String', '2020', 18980, 1639872000, 1.0001, 1.00000001, 100000.00000000000001, 1), (4, 1234, 3244467295, 500000000000, -1, -256, -14741221, -7000000000, 100.1, 14321.032141201, 'Another string', '2000', 20000, 1839882000, 34.1234, 123123.123123123, 123123123.123123123123123, NULL), (42, 42, 42, 42, 42, 42, 42, 42, 42.42, 42.42, '42', '4242', 42, 42, 42.42, 42.42424242, 424242.42424242424242, 42)";
 
diff --git a/tests/queries/0_stateless/01317_no_password_in_command_line.reference b/tests/queries/0_stateless/01317_no_password_in_command_line.reference
index aa47d0d46d4..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01317_no_password_in_command_line.reference
+++ b/tests/queries/0_stateless/01317_no_password_in_command_line.reference
@@ -1,2 +0,0 @@
-0
-0
diff --git a/tests/queries/0_stateless/01317_no_password_in_command_line.sh b/tests/queries/0_stateless/01317_no_password_in_command_line.sh
index c9886aca31e..5b95f077ea2 100755
--- a/tests/queries/0_stateless/01317_no_password_in_command_line.sh
+++ b/tests/queries/0_stateless/01317_no_password_in_command_line.sh
@@ -7,52 +7,40 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
-$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS user"
-$CLICKHOUSE_CLIENT --query "CREATE USER user IDENTIFIED WITH PLAINTEXT_PASSWORD BY 'hello'"
-
-# False positive result due to race condition with sleeps is Ok.
-
-$CLICKHOUSE_CLIENT --user user --password hello --query "SELECT sleep(1)" &
-bg_query=$!
+user=user_$CLICKHOUSE_TEST_UNIQUE_NAME
+$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS $user"
+$CLICKHOUSE_CLIENT --query "CREATE USER $user IDENTIFIED WITH PLAINTEXT_PASSWORD BY 'hello'"
+trap '$CLICKHOUSE_CLIENT --query "DROP USER $user"' EXIT
 
 # Wait for query to start executing. At that time, the password should be cleared.
-for _ in {1..20}
-do
-    if $CLICKHOUSE_CLIENT --query "SHOW PROCESSLIST" | grep -q 'SELECT sleep(1)'
-    then
-        break
-    fi
+function wait_query_pid()
+{
+    local query_id=$1 && shift
 
-    if ! kill -0 -- $bg_query 2>/dev/null
-    then
-        # The SELECT sleep(1) query finished earlier that we could grep for it in the process list, but it should have run for at least one second. It is Ok.
-        break
-    fi
-done
+    for _ in {1..20}; do
+        if [ "$($CLICKHOUSE_CLIENT --param_query_id "$query_id" --query "SELECT count() FROM system.processes WHERE query_id = {query_id:String}")" -eq 1 ]; then
+            break
+        fi
+        sleep 0.3
+    done
+}
 
-ps auxw | grep -F -- '--password' | grep -F hello ||:
-wait
-
-# Once again with different syntax
-$CLICKHOUSE_CLIENT --user user --password=hello --query "SELECT sleep(1)" &
+# --password <pass>
+query_id=first-$CLICKHOUSE_TEST_UNIQUE_NAME
+$CLICKHOUSE_CLIENT --query_id "$query_id" --user "$user" --password hello --max_block_size 1 --query "SELECT sleepEachRow(1) FROM system.numbers LIMIT 100" >& /dev/null &
 bg_query=$!
-
-# Wait for query to start executing. At that time, the password should be cleared.
-for _ in {1..20}
-do
-    if $CLICKHOUSE_CLIENT --query "SHOW PROCESSLIST" | grep -q 'SELECT sleep(1)'
-    then
-        break
-    fi
-
-    if ! kill -0 -- $bg_query 2>/dev/null
-    then
-        # The SELECT sleep(1) query finished earlier that we could grep for it in the process list, but it should have run for at least one second. It is Ok.
-        break
-    fi
-done
-
-ps auxw | grep -F -- '--password' | grep -F hello ||:
+wait_query_pid "$query_id"
+ps u --no-header $bg_query | grep -F -- '--password' | grep -F hello ||:
+grep -F -- '--password' < "/proc/$bg_query/comm" | grep -F hello ||:
+$CLICKHOUSE_CLIENT --format Null --param_query_id "$query_id" -q "KILL QUERY WHERE query_id = {query_id:String} SYNC"
 wait
 
-$CLICKHOUSE_CLIENT --query "DROP USER user"
+# --password=<pass>
+query_id=second-$CLICKHOUSE_TEST_UNIQUE_NAME
+$CLICKHOUSE_CLIENT --query_id "$query_id" --user "$user" --password=hello --max_block_size 1 --query "SELECT sleepEachRow(1) FROM system.numbers LIMIT 100" >& /dev/null &
+bg_query=$!
+wait_query_pid "$query_id"
+ps u --no-header $bg_query | grep -F -- '--password' | grep -F hello ||:
+grep -F -- '--password' < "/proc/$bg_query/comm" | grep -F hello ||:
+$CLICKHOUSE_CLIENT --format Null --param_query_id "$query_id" -q "KILL QUERY WHERE query_id = {query_id:String} SYNC"
+wait
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index d538cafd79d..758ec4825e0 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -12,19 +12,19 @@ $CLICKHOUSE_CLIENT --query "CREATE DATABASE test_01320 ENGINE=Ordinary"   # Diff
 
 function thread1()
 {
-    $CLICKHOUSE_CLIENT -n --query "CREATE TABLE test_01320.r (x UInt64) ENGINE = ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r') ORDER BY x; DROP TABLE test_01320.r;"
+    while true; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE test_01320.r (x UInt64) ENGINE = ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/table', 'r') ORDER BY x; DROP TABLE test_01320.r;"; done
 }
 
 function thread2()
 {
-    $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA test_01320.r" 2>/dev/null
+    while true; do $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA test_01320.r" 2>/dev/null; done
 }
 
 export -f thread1
 export -f thread2
 
-clickhouse_client_loop_timeout 10 thread1 &
-clickhouse_client_loop_timeout 10 thread2 &
+timeout 10 bash -c thread1 &
+timeout 10 bash -c thread2 &
 
 wait
 
diff --git a/tests/queries/0_stateless/01379_with_fill_several_columns.sql b/tests/queries/0_stateless/01379_with_fill_several_columns.sql
index 505b9e0f8e1..6bdf7d41b57 100644
--- a/tests/queries/0_stateless/01379_with_fill_several_columns.sql
+++ b/tests/queries/0_stateless/01379_with_fill_several_columns.sql
@@ -1,6 +1,6 @@
 SELECT
-    toDate(toDateTime((number * 10) * 86400, 'Europe/Moscow')) AS d1,
-    toDate(toDateTime(number * 86400, 'Europe/Moscow')) AS d2,
+    toDate(toDateTime((number * 10) * 86400, 'Asia/Istanbul')) AS d1,
+    toDate(toDateTime(number * 86400, 'Asia/Istanbul')) AS d2,
     'original' AS source
 FROM numbers(10)
 WHERE (number % 3) = 1
@@ -11,8 +11,8 @@ ORDER BY
 SELECT '===============';
 
 SELECT
-    toDate(toDateTime((number * 10) * 86400, 'Europe/Moscow')) AS d1,
-    toDate(toDateTime(number * 86400, 'Europe/Moscow')) AS d2,
+    toDate(toDateTime((number * 10) * 86400, 'Asia/Istanbul')) AS d1,
+    toDate(toDateTime(number * 86400, 'Asia/Istanbul')) AS d2,
     'original' AS source
 FROM numbers(10)
 WHERE (number % 3) = 1
diff --git a/tests/queries/0_stateless/01396_negative_datetime_saturate_to_zero.sql b/tests/queries/0_stateless/01396_negative_datetime_saturate_to_zero.sql
index 2711ab3cceb..e52c2d3dd1b 100644
--- a/tests/queries/0_stateless/01396_negative_datetime_saturate_to_zero.sql
+++ b/tests/queries/0_stateless/01396_negative_datetime_saturate_to_zero.sql
@@ -1 +1 @@
-SELECT toTimeZone(now(), 'Europe/Moscow') > '1970-01-01 00:00:00';
+SELECT toTimeZone(now(), 'Asia/Istanbul') > '1970-01-01 00:00:00';
diff --git a/tests/queries/0_stateless/01410_nullable_key_and_index.reference b/tests/queries/0_stateless/01410_nullable_key_and_index.reference
index c5b2ef292ea..da88fbddd7a 100644
--- a/tests/queries/0_stateless/01410_nullable_key_and_index.reference
+++ b/tests/queries/0_stateless/01410_nullable_key_and_index.reference
@@ -54,14 +54,14 @@
 123
 1	1
 1	3
-2	\N
-2	2
 2	1
+2	2
 2	7
 2	\N
-3	\N
+2	\N
 3	2
 3	4
+3	\N
 2	\N
 2	\N
 3	\N
diff --git a/tests/queries/0_stateless/01410_nullable_key_and_index.sql b/tests/queries/0_stateless/01410_nullable_key_and_index.sql
index 46a58152700..969432eba01 100644
--- a/tests/queries/0_stateless/01410_nullable_key_and_index.sql
+++ b/tests/queries/0_stateless/01410_nullable_key_and_index.sql
@@ -46,7 +46,7 @@ INSERT INTO nullable_minmax_index VALUES (1, 1), (2, 2), (3, 2), (2, 1); -- [1,
 INSERT INTO nullable_minmax_index VALUES (2, NULL), (3, NULL); -- [+Inf, +Inf]
 
 SET force_primary_key = 0;
-SELECT * FROM nullable_minmax_index ORDER BY k;
+SELECT * FROM nullable_minmax_index ORDER BY k, v;
 SET max_rows_to_read = 6;
 SELECT * FROM nullable_minmax_index WHERE v IS NULL;
 SET max_rows_to_read = 8;
diff --git a/tests/queries/0_stateless/01412_cache_dictionary_race.sh b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
index 7d189518a58..165a461193d 100755
--- a/tests/queries/0_stateless/01412_cache_dictionary_race.sh
+++ b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
@@ -26,41 +26,45 @@ LAYOUT(CACHE(SIZE_IN_CELLS 3));
 
 function dict_get_thread()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT dictGetString('ordinary_db.dict1', 'third_column', toUInt64(rand() % 1000)) from numbers(2)" &>/dev/null
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT dictGetString('ordinary_db.dict1', 'third_column', toUInt64(rand() % 1000)) from numbers(2)" &>/dev/null
+    done
 }
 
 
 function drop_create_table_thread()
 {
-    $CLICKHOUSE_CLIENT -n --query "CREATE TABLE ordinary_db.table_for_dict_real (
-        key_column UInt64,
-        second_column UInt8,
-        third_column String
-    )
-    ENGINE MergeTree() ORDER BY tuple();
-    INSERT INTO ordinary_db.table_for_dict_real SELECT number, number, toString(number) from numbers(2);
-    CREATE VIEW ordinary_db.view_for_dict AS SELECT key_column, second_column, third_column from ordinary_db.table_for_dict_real WHERE sleepEachRow(1) == 0;
+    while true; do
+        $CLICKHOUSE_CLIENT -n --query "CREATE TABLE ordinary_db.table_for_dict_real (
+            key_column UInt64,
+            second_column UInt8,
+            third_column String
+        )
+        ENGINE MergeTree() ORDER BY tuple();
+        INSERT INTO ordinary_db.table_for_dict_real SELECT number, number, toString(number) from numbers(2);
+        CREATE VIEW ordinary_db.view_for_dict AS SELECT key_column, second_column, third_column from ordinary_db.table_for_dict_real WHERE sleepEachRow(1) == 0;
 "
-    sleep 10
+        sleep 10
 
-    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS ordinary_db.table_for_dict_real"
-    sleep 10
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS ordinary_db.table_for_dict_real"
+        sleep 10
+    done
 }
 
-export -f dict_get_thread
-export -f drop_create_table_thread
+export -f dict_get_thread;
+export -f drop_create_table_thread;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
 
 
-clickhouse_client_loop_timeout $TIMEOUT bash -c drop_create_table_thread 2> /dev/null &
+timeout $TIMEOUT bash -c drop_create_table_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01414_low_cardinality_nullable.sql b/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
index c11e990cea8..2d3d31e9b5c 100644
--- a/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
+++ b/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
@@ -15,7 +15,7 @@ CREATE TABLE lc_nullable (
     f64 Array(LowCardinality(Nullable(Float64))),
 
     date Array(LowCardinality(Nullable(Date))),
-    date_time Array(LowCardinality(Nullable(DateTime('Europe/Moscow')))),
+    date_time Array(LowCardinality(Nullable(DateTime('Asia/Istanbul')))),
 
     str Array(LowCardinality(Nullable(String))),
     fixed_string Array(LowCardinality(Nullable(FixedString(5))))
@@ -33,8 +33,8 @@ INSERT INTO lc_nullable SELECT
     groupArray(toUInt64(number)) AS u64,
     groupArray(toFloat32(number)) AS f32,
     groupArray(toFloat64(number)) AS f64,
-    groupArray(toDate(number, 'Europe/Moscow')) AS date,
-    groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time,
+    groupArray(toDate(number, 'Asia/Istanbul')) AS date,
+    groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time,
     groupArray(toString(number)) AS str,
     groupArray(toFixedString(toString(number), 5)) AS fixed_string
     FROM (SELECT number FROM system.numbers LIMIT 15);
@@ -51,8 +51,8 @@ INSERT INTO lc_nullable SELECT
     groupArray(toUInt64(num)) AS u64,
     groupArray(toFloat32(num)) AS f32,
     groupArray(toFloat64(num)) AS f64,
-    groupArray(toDate(num, 'Europe/Moscow')) AS date,
-    groupArray(toDateTime(num, 'Europe/Moscow')) AS date_time,
+    groupArray(toDate(num, 'Asia/Istanbul')) AS date,
+    groupArray(toDateTime(num, 'Asia/Istanbul')) AS date_time,
     groupArray(toString(num)) AS str,
     groupArray(toFixedString(toString(num), 5)) AS fixed_string
     FROM (SELECT negate(number) as num FROM system.numbers LIMIT 15);
@@ -69,8 +69,8 @@ INSERT INTO lc_nullable SELECT
     groupArray(toUInt64(number)) AS u64,
     groupArray(toFloat32(number)) AS f32,
     groupArray(toFloat64(number)) AS f64,
-    groupArray(toDate(number, 'Europe/Moscow')) AS date,
-    groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time,
+    groupArray(toDate(number, 'Asia/Istanbul')) AS date,
+    groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time,
     groupArray(toString(number)) AS str,
     groupArray(toFixedString(toString(number), 5)) AS fixed_string
     FROM (SELECT number FROM system.numbers WHERE number >= 5 LIMIT 15);
@@ -87,8 +87,8 @@ INSERT INTO lc_nullable SELECT
     groupArray(toUInt64(number)) AS u64,
     groupArray(toFloat32(number)) AS f32,
     groupArray(toFloat64(number)) AS f64,
-    groupArray(toDate(number, 'Europe/Moscow')) AS date,
-    groupArray(toDateTime(number, 'Europe/Moscow')) AS date_time,
+    groupArray(toDate(number, 'Asia/Istanbul')) AS date,
+    groupArray(toDateTime(number, 'Asia/Istanbul')) AS date_time,
     groupArray(toString(number)) AS str,
     groupArray(toFixedString(toString(number), 5)) AS fixed_string
     FROM (SELECT number FROM system.numbers WHERE number >= 10 LIMIT 15);
@@ -123,8 +123,8 @@ INSERT INTO lc_nullable SELECT
     [NULL, toUInt64(n)] AS u64,
     [NULL, toFloat32(n)] AS f32,
     [NULL, toFloat64(n)] AS f64,
-    [NULL, toDate(n, 'Europe/Moscow')] AS date,
-    [NULL, toDateTime(n, 'Europe/Moscow')] AS date_time,
+    [NULL, toDate(n, 'Asia/Istanbul')] AS date,
+    [NULL, toDateTime(n, 'Asia/Istanbul')] AS date_time,
     [NULL, toString(n)] AS str,
     [NULL, toFixedString(toString(n), 5)] AS fixed_string
     FROM (SELECT 100 as n);
@@ -140,7 +140,7 @@ SELECT count() FROM lc_nullable WHERE has(u64, 1);
 SELECT count() FROM lc_nullable WHERE has(f32, 1);
 SELECT count() FROM lc_nullable WHERE has(f64, 1);
 SELECT count() FROM lc_nullable WHERE has(date, toDate('1970-01-02'));
-SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 03:00:01', 'Europe/Moscow'));
+SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 02:00:01', 'Asia/Istanbul'));
 SELECT count() FROM lc_nullable WHERE has(str, '1');
 SELECT count() FROM lc_nullable WHERE has(fixed_string, toFixedString('1', 5));
 
@@ -168,7 +168,7 @@ SELECT count() FROM lc_nullable WHERE has(u64, 5);
 SELECT count() FROM lc_nullable WHERE has(f32, 5);
 SELECT count() FROM lc_nullable WHERE has(f64, 5);
 SELECT count() FROM lc_nullable WHERE has(date, toDate('1970-01-06'));
-SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 03:00:05', 'Europe/Moscow'));
+SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 02:00:05', 'Asia/Istanbul'));
 SELECT count() FROM lc_nullable WHERE has(str, '5');
 SELECT count() FROM lc_nullable WHERE has(fixed_string, toFixedString('5', 5));
 
@@ -183,7 +183,7 @@ SELECT count() FROM lc_nullable WHERE has(u64, 10);
 SELECT count() FROM lc_nullable WHERE has(f32, 10);
 SELECT count() FROM lc_nullable WHERE has(f64, 10);
 SELECT count() FROM lc_nullable WHERE has(date, toDate('1970-01-11'));
-SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 03:00:10', 'Europe/Moscow'));
+SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 02:00:10', 'Asia/Istanbul'));
 SELECT count() FROM lc_nullable WHERE has(str, '10');
 SELECT count() FROM lc_nullable WHERE has(fixed_string, toFixedString('10', 5));
 
@@ -213,7 +213,7 @@ SELECT count() FROM lc_nullable WHERE has(u64, 100);
 SELECT count() FROM lc_nullable WHERE has(f32, 100);
 SELECT count() FROM lc_nullable WHERE has(f64, 100);
 SELECT count() FROM lc_nullable WHERE has(date, toDate('1970-04-11'));
-SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 03:01:40', 'Europe/Moscow'));
+SELECT count() FROM lc_nullable WHERE has(date_time, toDateTime('1970-01-01 02:01:40', 'Asia/Istanbul'));
 SELECT count() FROM lc_nullable WHERE has(str, '100');
 SELECT count() FROM lc_nullable WHERE has(fixed_string, toFixedString('100', 5));
 
diff --git a/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.reference b/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.reference
index 36cee487d54..1e63fb923aa 100644
--- a/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.reference
+++ b/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.reference
@@ -1,3 +1,3 @@
 2020-08-07 01:29:00
-1973-03-03 12:46:40
+1973-03-03 11:46:40
 2020-08-07 00:00:00
diff --git a/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.sql b/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.sql
index 071fefe0403..58759c8585b 100644
--- a/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.sql
+++ b/tests/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.sql
@@ -1,3 +1,3 @@
-SELECT parseDateTimeBestEffort('1596752940', 'Europe/Moscow');
-SELECT parseDateTimeBestEffort('100000000', 'Europe/Moscow');
-SELECT parseDateTimeBestEffort('20200807', 'Europe/Moscow');
+SELECT parseDateTimeBestEffort('1596752940', 'Asia/Istanbul');
+SELECT parseDateTimeBestEffort('100000000', 'Asia/Istanbul');
+SELECT parseDateTimeBestEffort('20200807', 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01440_to_date_monotonicity.reference b/tests/queries/0_stateless/01440_to_date_monotonicity.reference
index 74716fe6223..2dbec540fbb 100644
--- a/tests/queries/0_stateless/01440_to_date_monotonicity.reference
+++ b/tests/queries/0_stateless/01440_to_date_monotonicity.reference
@@ -1,4 +1,4 @@
 0
 1970-01-01	2106-02-07	1970-04-11	1970-01-01	2149-06-06
-1970-01-01 03:00:00	2106-02-07 09:28:15	1970-01-01 03:16:40
+1970-01-01 02:00:00	2106-02-07 09:28:15	1970-01-01 02:16:40
 2000-01-01 13:12:12
diff --git a/tests/queries/0_stateless/01440_to_date_monotonicity.sql b/tests/queries/0_stateless/01440_to_date_monotonicity.sql
index 8843d7ffca6..b4c4f98b223 100644
--- a/tests/queries/0_stateless/01440_to_date_monotonicity.sql
+++ b/tests/queries/0_stateless/01440_to_date_monotonicity.sql
@@ -1,11 +1,11 @@
 DROP TABLE IF EXISTS tdm;
 DROP TABLE IF EXISTS tdm2;
-CREATE TABLE tdm (x DateTime('Europe/Moscow')) ENGINE = MergeTree ORDER BY x SETTINGS write_final_mark = 0;
+CREATE TABLE tdm (x DateTime('Asia/Istanbul')) ENGINE = MergeTree ORDER BY x SETTINGS write_final_mark = 0;
 INSERT INTO tdm VALUES (now());
-SELECT count(x) FROM tdm WHERE toDate(x) < toDate(now(), 'Europe/Moscow') SETTINGS max_rows_to_read = 1;
+SELECT count(x) FROM tdm WHERE toDate(x) < toDate(now(), 'Asia/Istanbul') SETTINGS max_rows_to_read = 1;
 
-SELECT toDate(-1), toDate(10000000000000, 'Europe/Moscow'), toDate(100), toDate(65536, 'UTC'), toDate(65535, 'Europe/Moscow');
-SELECT toDateTime(-1, 'Europe/Moscow'), toDateTime(10000000000000, 'Europe/Moscow'), toDateTime(1000, 'Europe/Moscow');
+SELECT toDate(-1), toDate(10000000000000, 'Asia/Istanbul'), toDate(100), toDate(65536, 'UTC'), toDate(65535, 'Asia/Istanbul');
+SELECT toDateTime(-1, 'Asia/Istanbul'), toDateTime(10000000000000, 'Asia/Istanbul'), toDateTime(1000, 'Asia/Istanbul');
 
 CREATE TABLE tdm2 (timestamp UInt32) ENGINE = MergeTree ORDER BY timestamp SETTINGS index_granularity = 1;
 
diff --git a/tests/queries/0_stateless/01442_date_time_with_params.reference b/tests/queries/0_stateless/01442_date_time_with_params.reference
index 726e59d4d35..bc819d5f8fc 100644
--- a/tests/queries/0_stateless/01442_date_time_with_params.reference
+++ b/tests/queries/0_stateless/01442_date_time_with_params.reference
@@ -1,6 +1,6 @@
-2020-01-01 00:00:00	DateTime	2020-01-01 00:01:00	DateTime	2020-01-01 00:02:00.11	DateTime64(2)	2020-01-01 00:03:00	DateTime(\'Europe/Moscow\')	2020-01-01 00:04:00.220	DateTime64(3, \'Europe/Moscow\')	2020-01-01 00:05:00	DateTime	2020-01-01 00:06:00	DateTime(\'Europe/Moscow\')	2020-01-01 00:06:00	DateTime
-2020-01-01 00:00:00	DateTime	2020-01-01 00:02:00.11	DateTime64(2)	2020-01-01 00:03:00	DateTime(\'Europe/Moscow\')	2020-01-01 00:04:00.220	DateTime64(3, \'Europe/Moscow\')	2020-01-01 00:05:00	DateTime
-2020-01-01 00:00:00	DateTime	2020-01-01 00:02:00.11	DateTime64(2)	2020-01-01 00:03:00	DateTime(\'Europe/Moscow\')	2020-01-01 00:04:00.220	DateTime64(3, \'Europe/Moscow\')	2020-01-01 00:05:00	DateTime
+2020-01-01 00:00:00	DateTime	2020-01-01 00:01:00	DateTime	2020-01-01 00:02:00.11	DateTime64(2)	2020-01-01 00:03:00	DateTime(\'Asia/Istanbul\')	2020-01-01 00:04:00.220	DateTime64(3, \'Asia/Istanbul\')	2020-01-01 00:05:00	DateTime	2020-01-01 00:06:00	DateTime(\'Asia/Istanbul\')	2020-01-01 00:06:00	DateTime
+2020-01-01 00:00:00	DateTime	2020-01-01 00:02:00.11	DateTime64(2)	2020-01-01 00:03:00	DateTime(\'Asia/Istanbul\')	2020-01-01 00:04:00.220	DateTime64(3, \'Asia/Istanbul\')	2020-01-01 00:05:00	DateTime
+2020-01-01 00:00:00	DateTime	2020-01-01 00:02:00.11	DateTime64(2)	2020-01-01 00:03:00	DateTime(\'Asia/Istanbul\')	2020-01-01 00:04:00.220	DateTime64(3, \'Asia/Istanbul\')	2020-01-01 00:05:00	DateTime
 2020-01-01 00:00:00	DateTime
 parseDateTimeBestEffort
 2020-05-14 03:37:03.000	DateTime64(3, \'UTC\')
diff --git a/tests/queries/0_stateless/01442_date_time_with_params.sql b/tests/queries/0_stateless/01442_date_time_with_params.sql
index 5a57aabdb0c..aeb9aa597ef 100644
--- a/tests/queries/0_stateless/01442_date_time_with_params.sql
+++ b/tests/queries/0_stateless/01442_date_time_with_params.sql
@@ -1,14 +1,14 @@
 DROP TABLE IF EXISTS test;
 
-CREATE TABLE test (a DateTime, b DateTime(), c DateTime(2), d DateTime('Europe/Moscow'), e DateTime(3, 'Europe/Moscow'), f DateTime32, g DateTime32('Europe/Moscow'), h DateTime(0)) ENGINE = MergeTree ORDER BY a;
+CREATE TABLE test (a DateTime, b DateTime(), c DateTime(2), d DateTime('Asia/Istanbul'), e DateTime(3, 'Asia/Istanbul'), f DateTime32, g DateTime32('Asia/Istanbul'), h DateTime(0)) ENGINE = MergeTree ORDER BY a;
 
 INSERT INTO test VALUES('2020-01-01 00:00:00', '2020-01-01 00:01:00', '2020-01-01 00:02:00.11', '2020-01-01 00:03:00', '2020-01-01 00:04:00.22', '2020-01-01 00:05:00', '2020-01-01 00:06:00', '2020-01-01 00:06:00');
 
 SELECT a, toTypeName(a), b, toTypeName(b), c, toTypeName(c), d, toTypeName(d), e, toTypeName(e), f, toTypeName(f), g, toTypeName(g), h, toTypeName(h) FROM test;
 
-SELECT toDateTime('2020-01-01 00:00:00') AS a, toTypeName(a), toDateTime('2020-01-01 00:02:00.11', 2) AS b, toTypeName(b), toDateTime('2020-01-01 00:03:00', 'Europe/Moscow') AS c, toTypeName(c), toDateTime('2020-01-01 00:04:00.22', 3, 'Europe/Moscow') AS d, toTypeName(d), toDateTime('2020-01-01 00:05:00', 0) AS e, toTypeName(e);
+SELECT toDateTime('2020-01-01 00:00:00') AS a, toTypeName(a), toDateTime('2020-01-01 00:02:00.11', 2) AS b, toTypeName(b), toDateTime('2020-01-01 00:03:00', 'Asia/Istanbul') AS c, toTypeName(c), toDateTime('2020-01-01 00:04:00.22', 3, 'Asia/Istanbul') AS d, toTypeName(d), toDateTime('2020-01-01 00:05:00', 0) AS e, toTypeName(e);
 
-SELECT CAST('2020-01-01 00:00:00', 'DateTime') AS a, toTypeName(a), CAST('2020-01-01 00:02:00.11', 'DateTime(2)') AS b, toTypeName(b), CAST('2020-01-01 00:03:00', 'DateTime(\'Europe/Moscow\')') AS c, toTypeName(c), CAST('2020-01-01 00:04:00.22', 'DateTime(3, \'Europe/Moscow\')') AS d, toTypeName(d), CAST('2020-01-01 00:05:00', 'DateTime(0)') AS e, toTypeName(e);
+SELECT CAST('2020-01-01 00:00:00', 'DateTime') AS a, toTypeName(a), CAST('2020-01-01 00:02:00.11', 'DateTime(2)') AS b, toTypeName(b), CAST('2020-01-01 00:03:00', 'DateTime(\'Asia/Istanbul\')') AS c, toTypeName(c), CAST('2020-01-01 00:04:00.22', 'DateTime(3, \'Asia/Istanbul\')') AS d, toTypeName(d), CAST('2020-01-01 00:05:00', 'DateTime(0)') AS e, toTypeName(e);
 
 SELECT toDateTime32('2020-01-01 00:00:00') AS a, toTypeName(a);
 
diff --git a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
index 51989685e05..eb231e71525 100755
--- a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
+++ b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
@@ -11,14 +11,18 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 function thread1()
 {
-    # ${CLICKHOUSE_CLIENT} --query="SHOW TABLES FROM test_01444"
-    ${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS test_01444" 2>&1| grep -F "Code: " | grep -Fv "Code: 219"
-    ${CLICKHOUSE_CLIENT} --query="CREATE DATABASE IF NOT EXISTS test_01444"
+    while true; do
+#        ${CLICKHOUSE_CLIENT} --query="SHOW TABLES FROM test_01444"
+        ${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS test_01444" 2>&1| grep -F "Code: " | grep -Fv "Code: 219"
+        ${CLICKHOUSE_CLIENT} --query="CREATE DATABASE IF NOT EXISTS test_01444"
+    done
 }
 
 function thread2()
 {
-    ${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS test_01444.t$RANDOM (x UInt8) ENGINE = MergeTree ORDER BY tuple()" 2>/dev/null
+    while true; do
+        ${CLICKHOUSE_CLIENT} --query="CREATE TABLE IF NOT EXISTS test_01444.t$RANDOM (x UInt8) ENGINE = MergeTree ORDER BY tuple()" 2>/dev/null
+    done
 }
 
 export -f thread1
@@ -26,9 +30,9 @@ export -f thread2
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT thread1 &
-clickhouse_client_loop_timeout $TIMEOUT thread2 &
-clickhouse_client_loop_timeout $TIMEOUT thread2 &
+timeout $TIMEOUT bash -c thread1 &
+timeout $TIMEOUT bash -c thread2 &
+timeout $TIMEOUT bash -c thread2 &
 
 wait
 
diff --git a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
index 27fa74f332c..d83343b3cb3 100755
--- a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
+++ b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
@@ -10,13 +10,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS mem"
 $CLICKHOUSE_CLIENT -q "CREATE TABLE mem (x UInt64) engine = Memory"
 
-function f()
-{
+function f {
+  for _ in $(seq 1 300); do
     $CLICKHOUSE_CLIENT -q "SELECT count() FROM (SELECT * FROM mem SETTINGS max_threads=2) FORMAT Null;"
+  done
 }
 
-function g()
-{
+function g {
+  for _ in $(seq 1 100); do
     $CLICKHOUSE_CLIENT -n -q "
         INSERT INTO mem SELECT number FROM numbers(1000000);
         INSERT INTO mem SELECT number FROM numbers(1000000);
@@ -29,13 +30,14 @@ function g()
         INSERT INTO mem VALUES (1);
         TRUNCATE TABLE mem;
     "
+  done
 }
 
-export -f f
-export -f g
+export -f f;
+export -f g;
 
-clickhouse_client_loop_timeout 30 f > /dev/null &
-clickhouse_client_loop_timeout 30 g > /dev/null &
+timeout 30 bash -c f > /dev/null &
+timeout 30 bash -c g > /dev/null &
 wait
 
 $CLICKHOUSE_CLIENT -q "DROP TABLE mem"
diff --git a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
index 142b83f1e0b..b659d550fa4 100755
--- a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
@@ -10,40 +10,46 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-function thread_create()
-{
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS $1 (x UInt64, s Array(Nullable(String))) ENGINE = $2"
-    sleep 0.0$RANDOM
+function thread_create {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS $1 (x UInt64, s Array(Nullable(String))) ENGINE = $2"
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_drop()
-{
-    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1"
-    sleep 0.0$RANDOM
+function thread_drop {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1"
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_rename()
-{
-    $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
-    sleep 0.0$RANDOM
+function thread_rename {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_select()
-{
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
-    sleep 0.0$RANDOM
+function thread_select {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_insert()
-{
-    $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: '| grep -v -P 'Code: (60|218)'
-    sleep 0.0$RANDOM
+function thread_insert {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: '| grep -v -P 'Code: (60|218)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_insert_select()
-{
-    $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
-    sleep 0.0$RANDOM
+function thread_insert_select {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
+        sleep 0.0$RANDOM
+    done
 }
 
 export -f thread_create
@@ -59,18 +65,18 @@ export -f thread_insert_select
 function test_with_engine {
     echo "Testing $1"
 
-    clickhouse_client_loop_timeout 10 thread_create t1 $1 &
-    clickhouse_client_loop_timeout 10 thread_create t2 $1 &
-    clickhouse_client_loop_timeout 10 thread_drop t1 &
-    clickhouse_client_loop_timeout 10 thread_drop t2 &
-    clickhouse_client_loop_timeout 10 thread_rename t1 t2 &
-    clickhouse_client_loop_timeout 10 thread_rename t2 t1 &
-    clickhouse_client_loop_timeout 10 thread_select t1 &
-    clickhouse_client_loop_timeout 10 thread_select t2 &
-    clickhouse_client_loop_timeout 10 thread_insert t1 5 &
-    clickhouse_client_loop_timeout 10 thread_insert t2 10 &
-    clickhouse_client_loop_timeout 10 thread_insert_select t1 t2 &
-    clickhouse_client_loop_timeout 10 thread_insert_select t2 t1 &
+    timeout 10 bash -c "thread_create t1 $1" &
+    timeout 10 bash -c "thread_create t2 $1" &
+    timeout 10 bash -c 'thread_drop t1' &
+    timeout 10 bash -c 'thread_drop t2' &
+    timeout 10 bash -c 'thread_rename t1 t2' &
+    timeout 10 bash -c 'thread_rename t2 t1' &
+    timeout 10 bash -c 'thread_select t1' &
+    timeout 10 bash -c 'thread_select t2' &
+    timeout 10 bash -c 'thread_insert t1 5' &
+    timeout 10 bash -c 'thread_insert t2 10' &
+    timeout 10 bash -c 'thread_insert_select t1 t2' &
+    timeout 10 bash -c 'thread_insert_select t2 t1' &
 
     wait
     echo "Done $1"
diff --git a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
index a3dadf48c38..1087a7ed96b 100755
--- a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
@@ -10,40 +10,46 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-function thread_create()
-{
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS $1 (x UInt64, s Array(Nullable(String))) ENGINE = $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
-    sleep 0.0$RANDOM
+function thread_create {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS $1 (x UInt64, s Array(Nullable(String))) ENGINE = $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_drop()
-{
-    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
-    sleep 0.0$RANDOM
+function thread_drop {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_rename()
-{
-    $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
-    sleep 0.0$RANDOM
+function thread_rename {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_select()
-{
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
-    sleep 0.0$RANDOM
+function thread_select {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_insert()
-{
-    $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
-    sleep 0.0$RANDOM
+function thread_insert {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_insert_select()
-{
-    $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
-    sleep 0.0$RANDOM
+function thread_insert_select {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
+        sleep 0.0$RANDOM
+    done
 }
 
 export -f thread_create
@@ -59,18 +65,18 @@ export -f thread_insert_select
 function test_with_engine {
     echo "Testing $1"
 
-    clickhouse_client_loop_timeout 10 thread_create t1 $1 &
-    clickhouse_client_loop_timeout 10 thread_create t2 $1 &
-    clickhouse_client_loop_timeout 10 thread_drop t1 &
-    clickhouse_client_loop_timeout 10 thread_drop t2 &
-    clickhouse_client_loop_timeout 10 thread_rename t1 t2 &
-    clickhouse_client_loop_timeout 10 thread_rename t2 t1 &
-    clickhouse_client_loop_timeout 10 thread_select t1 &
-    clickhouse_client_loop_timeout 10 thread_select t2 &
-    clickhouse_client_loop_timeout 10 thread_insert t1 5 &
-    clickhouse_client_loop_timeout 10 thread_insert t2 10 &
-    clickhouse_client_loop_timeout 10 thread_insert_select t1 t2 &
-    clickhouse_client_loop_timeout 10 thread_insert_select t2 t1 &
+    timeout 10 bash -c "thread_create t1 $1" &
+    timeout 10 bash -c "thread_create t2 $1" &
+    timeout 10 bash -c 'thread_drop t1' &
+    timeout 10 bash -c 'thread_drop t2' &
+    timeout 10 bash -c 'thread_rename t1 t2' &
+    timeout 10 bash -c 'thread_rename t2 t1' &
+    timeout 10 bash -c 'thread_select t1' &
+    timeout 10 bash -c 'thread_select t2' &
+    timeout 10 bash -c 'thread_insert t1 5' &
+    timeout 10 bash -c 'thread_insert t2 10' &
+    timeout 10 bash -c 'thread_insert_select t1 t2' &
+    timeout 10 bash -c 'thread_insert_select t2 t1' &
 
     wait
     echo "Done $1"
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.queries b/tests/queries/0_stateless/01508_partition_pruning_long.queries
index 786240145a9..0d64fc05f0f 100644
--- a/tests/queries/0_stateless/01508_partition_pruning_long.queries
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.queries
@@ -2,20 +2,20 @@ DROP TABLE IF EXISTS tMM;
 DROP TABLE IF EXISTS tDD;
 DROP TABLE IF EXISTS sDD;
 DROP TABLE IF EXISTS xMM;
-CREATE TABLE tMM(d DateTime('Europe/Moscow'), a Int64) ENGINE = MergeTree PARTITION BY toYYYYMM(d) ORDER BY tuple() SETTINGS index_granularity = 8192;
+CREATE TABLE tMM(d DateTime('Asia/Istanbul'), a Int64) ENGINE = MergeTree PARTITION BY toYYYYMM(d) ORDER BY tuple() SETTINGS index_granularity = 8192;
 SYSTEM STOP MERGES tMM;
-INSERT INTO tMM SELECT toDateTime('2020-08-16 00:00:00', 'Europe/Moscow') + number*60, number FROM numbers(5000);
-INSERT INTO tMM SELECT toDateTime('2020-08-16 00:00:00', 'Europe/Moscow') + number*60, number FROM numbers(5000);
-INSERT INTO tMM SELECT toDateTime('2020-09-01 00:00:00', 'Europe/Moscow') + number*60, number FROM numbers(5000);
-INSERT INTO tMM SELECT toDateTime('2020-09-01 00:00:00', 'Europe/Moscow') + number*60, number FROM numbers(5000);
-INSERT INTO tMM SELECT toDateTime('2020-10-01 00:00:00', 'Europe/Moscow') + number*60, number FROM numbers(5000);
-INSERT INTO tMM SELECT toDateTime('2020-10-15 00:00:00', 'Europe/Moscow') + number*60, number FROM numbers(5000);
+INSERT INTO tMM SELECT toDateTime('2020-08-16 00:00:00', 'Asia/Istanbul') + number*60, number FROM numbers(5000);
+INSERT INTO tMM SELECT toDateTime('2020-08-16 00:00:00', 'Asia/Istanbul') + number*60, number FROM numbers(5000);
+INSERT INTO tMM SELECT toDateTime('2020-09-01 00:00:00', 'Asia/Istanbul') + number*60, number FROM numbers(5000);
+INSERT INTO tMM SELECT toDateTime('2020-09-01 00:00:00', 'Asia/Istanbul') + number*60, number FROM numbers(5000);
+INSERT INTO tMM SELECT toDateTime('2020-10-01 00:00:00', 'Asia/Istanbul') + number*60, number FROM numbers(5000);
+INSERT INTO tMM SELECT toDateTime('2020-10-15 00:00:00', 'Asia/Istanbul') + number*60, number FROM numbers(5000);
 
-CREATE TABLE tDD(d DateTime('Europe/Moscow'),a Int) ENGINE = MergeTree PARTITION BY toYYYYMMDD(d) ORDER BY tuple() SETTINGS index_granularity = 8192;
+CREATE TABLE tDD(d DateTime('Asia/Istanbul'),a Int) ENGINE = MergeTree PARTITION BY toYYYYMMDD(d) ORDER BY tuple() SETTINGS index_granularity = 8192;
 SYSTEM STOP MERGES tDD;
-insert into tDD select toDateTime(toDate('2020-09-23'), 'Europe/Moscow'), number from numbers(10000) UNION ALL select toDateTime(toDateTime('2020-09-23 11:00:00', 'Europe/Moscow')), number from numbers(10000) UNION ALL select toDateTime(toDate('2020-09-24'), 'Europe/Moscow'), number from numbers(10000) UNION ALL select toDateTime(toDate('2020-09-25'), 'Europe/Moscow'), number from numbers(10000) UNION ALL select toDateTime(toDate('2020-08-15'), 'Europe/Moscow'), number from numbers(10000);
+insert into tDD select toDateTime(toDate('2020-09-23'), 'Asia/Istanbul'), number from numbers(10000) UNION ALL select toDateTime(toDateTime('2020-09-23 11:00:00', 'Asia/Istanbul')), number from numbers(10000) UNION ALL select toDateTime(toDate('2020-09-24'), 'Asia/Istanbul'), number from numbers(10000) UNION ALL select toDateTime(toDate('2020-09-25'), 'Asia/Istanbul'), number from numbers(10000) UNION ALL select toDateTime(toDate('2020-08-15'), 'Asia/Istanbul'), number from numbers(10000);
 
-CREATE TABLE sDD(d UInt64,a Int) ENGINE = MergeTree PARTITION BY toYYYYMM(toDate(intDiv(d,1000), 'Europe/Moscow')) ORDER BY tuple() SETTINGS index_granularity = 8192;
+CREATE TABLE sDD(d UInt64,a Int) ENGINE = MergeTree PARTITION BY toYYYYMM(toDate(intDiv(d,1000), 'Asia/Istanbul')) ORDER BY tuple() SETTINGS index_granularity = 8192;
 SYSTEM STOP MERGES sDD;
 insert into sDD select (1597536000+number*60)*1000, number from numbers(5000);
 insert into sDD select (1597536000+number*60)*1000, number from numbers(5000);
@@ -24,14 +24,14 @@ insert into sDD select (1598918400+number*60)*1000, number from numbers(5000);
 insert into sDD select (1601510400+number*60)*1000, number from numbers(5000);
 insert into sDD select (1602720000+number*60)*1000, number from numbers(5000);
 
-CREATE TABLE xMM(d DateTime('Europe/Moscow'),a Int64, f Int64) ENGINE = MergeTree PARTITION BY (toYYYYMM(d), a) ORDER BY tuple() SETTINGS index_granularity = 8192;
+CREATE TABLE xMM(d DateTime('Asia/Istanbul'),a Int64, f Int64) ENGINE = MergeTree PARTITION BY (toYYYYMM(d), a) ORDER BY tuple() SETTINGS index_granularity = 8192;
 SYSTEM STOP MERGES xMM;
-INSERT INTO xMM SELECT toDateTime('2020-08-16 00:00:00', 'Europe/Moscow') + number*60, 1, number FROM numbers(5000);
-INSERT INTO xMM SELECT toDateTime('2020-08-16 00:00:00', 'Europe/Moscow') + number*60, 2, number FROM numbers(5000);
-INSERT INTO xMM SELECT toDateTime('2020-09-01 00:00:00', 'Europe/Moscow') + number*60, 3, number FROM numbers(5000);
-INSERT INTO xMM SELECT toDateTime('2020-09-01 00:00:00', 'Europe/Moscow') + number*60, 2, number FROM numbers(5000);
-INSERT INTO xMM SELECT toDateTime('2020-10-01 00:00:00', 'Europe/Moscow') + number*60, 1, number FROM numbers(5000);
-INSERT INTO xMM SELECT toDateTime('2020-10-15 00:00:00', 'Europe/Moscow') + number*60, 1, number FROM numbers(5000);
+INSERT INTO xMM SELECT toDateTime('2020-08-16 00:00:00', 'Asia/Istanbul') + number*60, 1, number FROM numbers(5000);
+INSERT INTO xMM SELECT toDateTime('2020-08-16 00:00:00', 'Asia/Istanbul') + number*60, 2, number FROM numbers(5000);
+INSERT INTO xMM SELECT toDateTime('2020-09-01 00:00:00', 'Asia/Istanbul') + number*60, 3, number FROM numbers(5000);
+INSERT INTO xMM SELECT toDateTime('2020-09-01 00:00:00', 'Asia/Istanbul') + number*60, 2, number FROM numbers(5000);
+INSERT INTO xMM SELECT toDateTime('2020-10-01 00:00:00', 'Asia/Istanbul') + number*60, 1, number FROM numbers(5000);
+INSERT INTO xMM SELECT toDateTime('2020-10-15 00:00:00', 'Asia/Istanbul') + number*60, 1, number FROM numbers(5000);
 
 
 SELECT '--------- tMM ----------------------------';
@@ -44,8 +44,8 @@ select uniqExact(_part), count() from tMM where toYYYYMMDD(d)=20200816;
 select uniqExact(_part), count() from tMM where toYYYYMMDD(d)=20201015;
 select uniqExact(_part), count() from tMM where toDate(d)='2020-10-15';
 select uniqExact(_part), count() from tMM where d >= '2020-09-01 00:00:00' and d<'2020-10-15 00:00:00';
-select uniqExact(_part), count() from tMM where d >= '2020-01-16 00:00:00' and d < toDateTime('2021-08-17 00:00:00', 'Europe/Moscow');
-select uniqExact(_part), count() from tMM where d >= '2020-09-16 00:00:00' and d < toDateTime('2020-10-01 00:00:00', 'Europe/Moscow');
+select uniqExact(_part), count() from tMM where d >= '2020-01-16 00:00:00' and d < toDateTime('2021-08-17 00:00:00', 'Asia/Istanbul');
+select uniqExact(_part), count() from tMM where d >= '2020-09-16 00:00:00' and d < toDateTime('2020-10-01 00:00:00', 'Asia/Istanbul');
 select uniqExact(_part), count() from tMM where d >= '2020-09-12 00:00:00' and d < '2020-10-16 00:00:00';
 select uniqExact(_part), count() from tMM where toStartOfDay(d) >= '2020-09-12 00:00:00';
 select uniqExact(_part), count() from tMM where toStartOfDay(d) = '2020-09-01 00:00:00';
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.reference b/tests/queries/0_stateless/01508_partition_pruning_long.reference
index 9cd208a336f..afdb4257505 100644
--- a/tests/queries/0_stateless/01508_partition_pruning_long.reference
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.reference
@@ -35,11 +35,11 @@ select uniqExact(_part), count() from tMM where d >= '2020-09-01 00:00:00' and d
 3	15000
 Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
-select uniqExact(_part), count() from tMM where d >= '2020-01-16 00:00:00' and d < toDateTime('2021-08-17 00:00:00', 'Europe/Moscow');
+select uniqExact(_part), count() from tMM where d >= '2020-01-16 00:00:00' and d < toDateTime('2021-08-17 00:00:00', 'Asia/Istanbul');
 6	30000
 Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
-select uniqExact(_part), count() from tMM where d >= '2020-09-16 00:00:00' and d < toDateTime('2020-10-01 00:00:00', 'Europe/Moscow');
+select uniqExact(_part), count() from tMM where d >= '2020-09-16 00:00:00' and d < toDateTime('2020-10-01 00:00:00', 'Asia/Istanbul');
 0	0
 Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primary key, 0 marks to read from 0 ranges
 
diff --git a/tests/queries/0_stateless/01516_date_time_output_format.sql b/tests/queries/0_stateless/01516_date_time_output_format.sql
index 224d8ef1035..3c99d1bb81b 100644
--- a/tests/queries/0_stateless/01516_date_time_output_format.sql
+++ b/tests/queries/0_stateless/01516_date_time_output_format.sql
@@ -1,16 +1,16 @@
 DROP TABLE IF EXISTS test_datetime;
 
-CREATE TABLE test_datetime(timestamp DateTime('Europe/Moscow')) ENGINE=Log;
+CREATE TABLE test_datetime(timestamp DateTime('Asia/Istanbul')) ENGINE=Log;
 
 INSERT INTO test_datetime VALUES ('2020-10-15 00:00:00');
 
 SET date_time_output_format = 'simple';
 SELECT timestamp FROM test_datetime;
-SELECT formatDateTime(toDateTime('2020-10-15 00:00:00', 'Europe/Moscow'), '%Y-%m-%d %R:%S') as formatted_simple FROM test_datetime;
+SELECT formatDateTime(toDateTime('2020-10-15 00:00:00', 'Asia/Istanbul'), '%Y-%m-%d %R:%S') as formatted_simple FROM test_datetime;
 
 SET date_time_output_format = 'iso';
 SELECT timestamp FROM test_datetime;
-SELECT formatDateTime(toDateTime('2020-10-15 00:00:00', 'Europe/Moscow'), '%Y-%m-%dT%R:%SZ', 'UTC') as formatted_iso FROM test_datetime;;
+SELECT formatDateTime(toDateTime('2020-10-15 00:00:00', 'Asia/Istanbul'), '%Y-%m-%dT%R:%SZ', 'UTC') as formatted_iso FROM test_datetime;;
 
 SET date_time_output_format = 'unix_timestamp';
 SELECT timestamp FROM test_datetime;
@@ -19,7 +19,7 @@ SELECT toUnixTimestamp(timestamp) FROM test_datetime;
 SET date_time_output_format = 'simple';
 DROP TABLE test_datetime;
 
-CREATE TABLE test_datetime(timestamp DateTime64(3, 'Europe/Moscow')) Engine=Log;
+CREATE TABLE test_datetime(timestamp DateTime64(3, 'Asia/Istanbul')) Engine=Log;
 
 INSERT INTO test_datetime VALUES ('2020-10-15 00:00:00'), (1602709200123);
 
diff --git a/tests/queries/0_stateless/01521_alter_enum_and_reverse_read.sql b/tests/queries/0_stateless/01521_alter_enum_and_reverse_read.sql
index 7caa4d34214..014790a61c1 100644
--- a/tests/queries/0_stateless/01521_alter_enum_and_reverse_read.sql
+++ b/tests/queries/0_stateless/01521_alter_enum_and_reverse_read.sql
@@ -8,6 +8,6 @@ ALTER TABLE enum_test MODIFY COLUMN e Enum8('IU' = 1, 'WS' = 2, 'PS' = 3);
 
 INSERT INTO enum_test SELECT '2020-10-09 00:00:00', 'h1', 'PS' from numbers(1);
 
-SELECT * FROM enum_test ORDER BY timestamp DESC;
+SELECT * FROM enum_test ORDER BY timestamp, e desc;
 
 DROP TABLE IF EXISTS enum_test;
diff --git a/tests/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.sql b/tests/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.sql
index 90975b0d9c4..bffd12e5aca 100644
--- a/tests/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.sql
+++ b/tests/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.sql
@@ -11,8 +11,7 @@ INSERT INTO select_final SELECT toDate('2000-01-01'), number + 1, '' FROM number
 INSERT INTO select_final SELECT toDate('2020-01-01'), number, '' FROM numbers(2);
 INSERT INTO select_final SELECT toDate('2020-01-01'), number + 1, '' FROM numbers(2);
 
-
-SELECT * FROM select_final FINAL ORDER BY x;
+SELECT * FROM select_final FINAL ORDER BY x, t;
 
 TRUNCATE TABLE select_final;
 
diff --git a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
index 39ef530f6e9..981beb785a5 100755
--- a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
+++ b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
@@ -18,25 +18,27 @@ $CLICKHOUSE_CLIENT --query "CREATE DICTIONARY ordinary_db.dict1 ( key_column UIn
 
 function dict_get_thread()
 {
-    $CLICKHOUSE_CLIENT --query "SELECT dictGetString('ordinary_db.dict1', 'third_column', toUInt64(rand() % 1000)) from numbers(2)" &>/dev/null
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT dictGetString('ordinary_db.dict1', 'third_column', toUInt64(rand() % 1000)) from numbers(2)" &>/dev/null
+    done
 }
 
-export -f dict_get_thread
+export -f dict_get_thread;
 
 TIMEOUT=10
 
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
+timeout $TIMEOUT bash -c dict_get_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01582_any_join_supertype.sql b/tests/queries/0_stateless/01582_any_join_supertype.sql
index 6b06d78c83c..9cd7b4397ab 100644
--- a/tests/queries/0_stateless/01582_any_join_supertype.sql
+++ b/tests/queries/0_stateless/01582_any_join_supertype.sql
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS foo;
 DROP TABLE IF EXISTS bar;
 
-CREATE TABLE foo (server_date Date, server_time Datetime('Europe/Moscow'), dimension_1 String) ENGINE = MergeTree() PARTITION BY toYYYYMM(server_date) ORDER BY (server_date);
+CREATE TABLE foo (server_date Date, server_time Datetime('Asia/Istanbul'), dimension_1 String) ENGINE = MergeTree() PARTITION BY toYYYYMM(server_date) ORDER BY (server_date);
 CREATE TABLE bar (server_date Date, dimension_1 String) ENGINE = MergeTree() PARTITION BY toYYYYMM(server_date) ORDER BY (server_date);
 
 INSERT INTO foo VALUES ('2020-01-01', '2020-01-01 12:00:00', 'test1'), ('2020-01-01', '2020-01-01 13:00:00', 'test2');
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
index 30e1eff87da..acaa2cfcd25 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
@@ -13,32 +13,36 @@ $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_kill SELECT number, to
 
 function alter_thread
 {
-    TYPE=$($CLICKHOUSE_CLIENT --query "SELECT type FROM system.columns WHERE table='concurrent_mutate_kill' and database='${CLICKHOUSE_DATABASE}' and name='value'")
-    if [ "$TYPE" == "String" ]; then
-        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_mutate_kill MODIFY COLUMN value UInt64 SETTINGS replication_alter_partitions_sync=2"
-    else
-        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_mutate_kill MODIFY COLUMN value String SETTINGS replication_alter_partitions_sync=2"
-    fi
+    while true; do
+        TYPE=$($CLICKHOUSE_CLIENT --query "SELECT type FROM system.columns WHERE table='concurrent_mutate_kill' and database='${CLICKHOUSE_DATABASE}' and name='value'")
+        if [ "$TYPE" == "String" ]; then
+            $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_mutate_kill MODIFY COLUMN value UInt64 SETTINGS replication_alter_partitions_sync=2"
+        else
+            $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_mutate_kill MODIFY COLUMN value String SETTINGS replication_alter_partitions_sync=2"
+        fi
+    done
 }
 
 function kill_mutation_thread
 {
-    # find any mutation and kill it
-    mutation_id=$($CLICKHOUSE_CLIENT --query "SELECT mutation_id FROM system.mutations WHERE is_done=0 and database='${CLICKHOUSE_DATABASE}' and table='concurrent_mutate_kill' LIMIT 1")
-    if [ ! -z "$mutation_id" ]; then
-        $CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$mutation_id' and table='concurrent_mutate_kill' and database='${CLICKHOUSE_DATABASE}'" 1> /dev/null
-        sleep 1
-    fi
+    while true; do
+        # find any mutation and kill it
+        mutation_id=$($CLICKHOUSE_CLIENT --query "SELECT mutation_id FROM system.mutations WHERE is_done=0 and database='${CLICKHOUSE_DATABASE}' and table='concurrent_mutate_kill' LIMIT 1")
+        if [ ! -z "$mutation_id" ]; then
+            $CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$mutation_id' and table='concurrent_mutate_kill' and database='${CLICKHOUSE_DATABASE}'" 1> /dev/null
+            sleep 1
+        fi
+    done
 }
 
 
-export -f alter_thread
-export -f kill_mutation_thread
+export -f alter_thread;
+export -f kill_mutation_thread;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT alter_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT kill_mutation_thread 2> /dev/null &
+timeout $TIMEOUT bash -c alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c kill_mutation_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
index 3ee321371bf..f8f3ccd6dd6 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
@@ -27,34 +27,38 @@ for i in $(seq $REPLICAS); do
     $CLICKHOUSE_CLIENT --query "SELECT sum(toUInt64(value)) FROM concurrent_kill_$i"
 done
 
-function alter_thread()
+function alter_thread
 {
-    REPLICA=$(($RANDOM % 5 + 1))
-    TYPE=$($CLICKHOUSE_CLIENT --query "SELECT type FROM system.columns WHERE table='concurrent_kill_$REPLICA' and database='${CLICKHOUSE_DATABASE}' and name='value'")
-    if [ "$TYPE" == "String" ]; then
-        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_kill_$REPLICA MODIFY COLUMN value UInt64 SETTINGS replication_alter_partitions_sync=2"
-    else
-        $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_kill_$REPLICA MODIFY COLUMN value String SETTINGS replication_alter_partitions_sync=2"
-    fi
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        TYPE=$($CLICKHOUSE_CLIENT --query "SELECT type FROM system.columns WHERE table='concurrent_kill_$REPLICA' and database='${CLICKHOUSE_DATABASE}' and name='value'")
+        if [ "$TYPE" == "String" ]; then
+            $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_kill_$REPLICA MODIFY COLUMN value UInt64 SETTINGS replication_alter_partitions_sync=2"
+        else
+            $CLICKHOUSE_CLIENT --query "ALTER TABLE concurrent_kill_$REPLICA MODIFY COLUMN value String SETTINGS replication_alter_partitions_sync=2"
+        fi
+    done
 }
 
-function kill_mutation_thread()
+function kill_mutation_thread
 {
-    # find any mutation and kill it
-    mutation_id=$($CLICKHOUSE_CLIENT --query "SELECT mutation_id FROM system.mutations WHERE is_done = 0 and table like 'concurrent_kill_%' and database='${CLICKHOUSE_DATABASE}' LIMIT 1")
-    if [ ! -z "$mutation_id" ]; then
-        $CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$mutation_id' and table like 'concurrent_kill_%' and database='${CLICKHOUSE_DATABASE}'" 1> /dev/null
-        sleep 1
-    fi
+    while true; do
+        # find any mutation and kill it
+        mutation_id=$($CLICKHOUSE_CLIENT --query "SELECT mutation_id FROM system.mutations WHERE is_done = 0 and table like 'concurrent_kill_%' and database='${CLICKHOUSE_DATABASE}' LIMIT 1")
+        if [ ! -z "$mutation_id" ]; then
+            $CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$mutation_id' and table like 'concurrent_kill_%' and database='${CLICKHOUSE_DATABASE}'" 1> /dev/null
+            sleep 1
+        fi
+    done
 }
 
-export -f alter_thread
-export -f kill_mutation_thread
+export -f alter_thread;
+export -f kill_mutation_thread;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT alter_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT kill_mutation_thread 2> /dev/null &
+timeout $TIMEOUT bash -c alter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c kill_mutation_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.sh b/tests/queries/0_stateless/01602_max_distributed_connections.sh
index 0869d2d3a68..ed835a8768f 100755
--- a/tests/queries/0_stateless/01602_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.sh
@@ -15,14 +15,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 i=0 retries=30
 while [[ $i -lt $retries ]]; do
-    clickhouse_client_timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
+    timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
         SELECT sleep(1.5) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=0 && break
     ((++i))
 done
 
 i=0 retries=30
 while [[ $i -lt $retries ]]; do
-    clickhouse_client_timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
+    timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
         SELECT sleep(1.5) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=1 && break
     ((++i))
 done
@@ -30,13 +30,10 @@ done
 # If max_distributed_connections is low and async_socket_for_remote is disabled,
 #  the concurrency of distributed queries will be also low.
 
-clickhouse_client_timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
+timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
     SELECT sleep(0.15) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=0 && echo 'Fail'
 
-clickhouse_client_timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
+timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
     SELECT sleep(0.15) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=1 && echo 'Fail'
 
-# FIXME
-clickhouse_test_wait_queries 5
-
 echo 'Ok'
diff --git a/tests/queries/0_stateless/01615_two_args_function_index_fix.sql b/tests/queries/0_stateless/01615_two_args_function_index_fix.sql
index dd2bde2eafc..6128bdfcdfb 100644
--- a/tests/queries/0_stateless/01615_two_args_function_index_fix.sql
+++ b/tests/queries/0_stateless/01615_two_args_function_index_fix.sql
@@ -1,6 +1,6 @@
 drop table if exists bad_date_time;
 
-create table bad_date_time (time Datetime('Europe/Moscow'), count UInt16) Engine = MergeTree() ORDER BY (time);
+create table bad_date_time (time Datetime('Asia/Istanbul'), count UInt16) Engine = MergeTree() ORDER BY (time);
 
 insert into bad_date_time values('2020-12-20 20:59:52', 1),  ('2020-12-20 21:59:52', 1),  ('2020-12-20 01:59:52', 1);
 
diff --git a/tests/queries/0_stateless/01632_tinylog_read_write.sh b/tests/queries/0_stateless/01632_tinylog_read_write.sh
index 42211168d45..3f41bcc5924 100755
--- a/tests/queries/0_stateless/01632_tinylog_read_write.sh
+++ b/tests/queries/0_stateless/01632_tinylog_read_write.sh
@@ -9,32 +9,35 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --multiquery --query "DROP TABLE IF EXISTS test; CREATE TABLE IF NOT EXISTS test (x UInt64, s Array(Nullable(String))) ENGINE = TinyLog;"
 
-function thread_select()
-{
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM test FORMAT Null"
-    sleep 0.0$RANDOM
+function thread_select {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM test FORMAT Null"
+        sleep 0.0$RANDOM
+    done
 }
 
-function thread_insert()
-{
-    $CLICKHOUSE_CLIENT --query "INSERT INTO test VALUES (1, ['Hello'])"
-    sleep 0.0$RANDOM
+function thread_insert {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "INSERT INTO test VALUES (1, ['Hello'])"
+        sleep 0.0$RANDOM
+    done
 }
 
 export -f thread_select
 export -f thread_insert
 
+
 # Do randomized queries and expect nothing extraordinary happens.
 
-clickhouse_client_loop_timeout 10 thread_select &
-clickhouse_client_loop_timeout 10 thread_select &
-clickhouse_client_loop_timeout 10 thread_select &
-clickhouse_client_loop_timeout 10 thread_select &
+timeout 10 bash -c 'thread_select' &
+timeout 10 bash -c 'thread_select' &
+timeout 10 bash -c 'thread_select' &
+timeout 10 bash -c 'thread_select' &
 
-clickhouse_client_loop_timeout 10 thread_insert &
-clickhouse_client_loop_timeout 10 thread_insert &
-clickhouse_client_loop_timeout 10 thread_insert &
-clickhouse_client_loop_timeout 10 thread_insert &
+timeout 10 bash -c 'thread_insert' &
+timeout 10 bash -c 'thread_insert' &
+timeout 10 bash -c 'thread_insert' &
+timeout 10 bash -c 'thread_insert' &
 
 wait
 echo "Done"
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
index a06a9ec7057..93c4451524c 100755
--- a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
+++ b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
@@ -5,24 +5,26 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-function thread_create_drop_table()
-{
-    REPLICA=$(($RANDOM % 10))
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS t1 (x UInt64, s Array(Nullable(String))) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_01671', 'r_$REPLICA') order by x" 2>/dev/null
-    sleep 0.0$RANDOM
-    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS t1"
+function thread_create_drop_table {
+    while true; do
+        REPLICA=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS t1 (x UInt64, s Array(Nullable(String))) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_01671', 'r_$REPLICA') order by x" 2>/dev/null
+        sleep 0.0$RANDOM
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS t1"
+    done
 }
 
-function thread_alter_table()
-{
-    $CLICKHOUSE_CLIENT --query "ALTER TABLE $CLICKHOUSE_DATABASE.t1 on cluster test_shard_localhost ADD COLUMN newcol UInt32" >/dev/null 2>&1
-    sleep 0.0$RANDOM
+function thread_alter_table {
+    while true; do
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE $CLICKHOUSE_DATABASE.t1 on cluster test_shard_localhost ADD COLUMN newcol UInt32" >/dev/null 2>&1
+        sleep 0.0$RANDOM
+    done
 }
 
 export -f thread_create_drop_table
 export -f thread_alter_table
-clickhouse_client_loop_timeout 20 thread_create_drop_table &
-clickhouse_client_loop_timeout 20 thread_alter_table &
+timeout 20 bash -c "thread_create_drop_table" &
+timeout 20 bash -c 'thread_alter_table' &
 wait
 sleep 1
 
diff --git a/tests/queries/0_stateless/01675_data_type_coroutine.sh b/tests/queries/0_stateless/01675_data_type_coroutine.sh
index 687ff6ac473..4106d0d7f73 100755
--- a/tests/queries/0_stateless/01675_data_type_coroutine.sh
+++ b/tests/queries/0_stateless/01675_data_type_coroutine.sh
@@ -17,9 +17,3 @@ while [[ $counter -lt $retries ]]; do
 done
 
 echo 'Ok'
-
-# wait queries, since there is 'Maximum parse depth' error on the client
-# and in this case it simply reset the connection and don't read everything
-# from server, so there is no guarantee that the query is stopped when the
-# client returns
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/01675_data_type_coroutine_2.sh b/tests/queries/0_stateless/01675_data_type_coroutine_2.sh
index 9c4ed81e345..501b9d4ab12 100755
--- a/tests/queries/0_stateless/01675_data_type_coroutine_2.sh
+++ b/tests/queries/0_stateless/01675_data_type_coroutine_2.sh
@@ -17,9 +17,3 @@ done
 
 #echo "I = ${I}"
 echo 'Ok'
-
-# wait queries, since there is 'Maximum parse depth' error on the client
-# and in this case it simply reset the connection and don't read everything
-# from server, so there is no guarantee that the query is stopped when the
-# client returns
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/01676_reinterpret_as.reference b/tests/queries/0_stateless/01676_reinterpret_as.reference
index b800016375a..80e8784fd10 100644
--- a/tests/queries/0_stateless/01676_reinterpret_as.reference
+++ b/tests/queries/0_stateless/01676_reinterpret_as.reference
@@ -30,8 +30,8 @@ Integer and String types
 11	11	12593
 Dates
 1970-01-01	1970-01-01
-1970-01-01 03:00:00	1970-01-01 03:00:00
-1970-01-01 03:00:00.000	1970-01-01 03:00:00.000
+1970-01-01 02:00:00	1970-01-01 02:00:00
+1970-01-01 02:00:00.000	1970-01-01 02:00:00.000
 Decimals
 5	0.49
 5	0.49
diff --git a/tests/queries/0_stateless/01676_reinterpret_as.sql b/tests/queries/0_stateless/01676_reinterpret_as.sql
index e8c2a0b1373..cc52859724d 100644
--- a/tests/queries/0_stateless/01676_reinterpret_as.sql
+++ b/tests/queries/0_stateless/01676_reinterpret_as.sql
@@ -30,8 +30,8 @@ SELECT reinterpret(a, 'String'), reinterpretAsString(a), reinterpretAsUInt8('11'
 SELECT reinterpret(a, 'String'), reinterpretAsString(a), reinterpretAsUInt16('11') as a;
 SELECT 'Dates';
 SELECT reinterpret(0, 'Date'), reinterpret('', 'Date');
-SELECT reinterpret(0, 'DateTime(''Europe/Moscow'')'), reinterpret('', 'DateTime(''Europe/Moscow'')');
-SELECT reinterpret(0, 'DateTime64(3, ''Europe/Moscow'')'), reinterpret('', 'DateTime64(3, ''Europe/Moscow'')');
+SELECT reinterpret(0, 'DateTime(''Asia/Istanbul'')'), reinterpret('', 'DateTime(''Asia/Istanbul'')');
+SELECT reinterpret(0, 'DateTime64(3, ''Asia/Istanbul'')'), reinterpret('', 'DateTime64(3, ''Asia/Istanbul'')');
 SELECT 'Decimals';
 SELECT reinterpret(toDecimal32(5, 2), 'Decimal32(2)'), reinterpret('1', 'Decimal32(2)');
 SELECT reinterpret(toDecimal64(5, 2), 'Decimal64(2)'), reinterpret('1', 'Decimal64(2)');;
diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.reference b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
index 41a8d653a3f..6272103440c 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.reference
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
@@ -1,27 +1,27 @@
 -- { echo }
 -- These values are within the extended range of DateTime64 [1925-01-01, 2284-01-01)
-SELECT toTimeZone(toDateTime(-2, 2), 'Europe/Moscow');
-1970-01-01 02:59:58.00
-SELECT toDateTime64(-2, 2, 'Europe/Moscow');
-1970-01-01 02:59:58.00
-SELECT CAST(-1 AS DateTime64(0, 'Europe/Moscow'));
-1970-01-01 02:59:59
-SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64(0, 'Europe/Moscow'));
+SELECT toTimeZone(toDateTime(-2, 2), 'Asia/Istanbul');
+1970-01-01 01:59:58.00
+SELECT toDateTime64(-2, 2, 'Asia/Istanbul');
+1970-01-01 01:59:58.00
+SELECT CAST(-1 AS DateTime64(0, 'Asia/Istanbul'));
+1970-01-01 01:59:59
+SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64(0, 'Asia/Istanbul'));
 2020-01-01 00:00:00
-SELECT toDateTime64(bitShiftLeft(toUInt64(1), 33), 2, 'Europe/Moscow') FORMAT Null;
-SELECT toTimeZone(toDateTime(-2., 2), 'Europe/Moscow');
-1970-01-01 03:00:00.00
-SELECT toDateTime64(-2., 2, 'Europe/Moscow');
-1970-01-01 03:00:00.00
-SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow');
+SELECT toDateTime64(bitShiftLeft(toUInt64(1), 33), 2, 'Asia/Istanbul') FORMAT Null;
+SELECT toTimeZone(toDateTime(-2., 2), 'Asia/Istanbul');
+1970-01-01 02:00:00.00
+SELECT toDateTime64(-2., 2, 'Asia/Istanbul');
+1970-01-01 02:00:00.00
+SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul');
 2106-02-07 09:28:16.00
-SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow') FORMAT Null;
+SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul') FORMAT Null;
 -- These are outsize of extended range and hence clamped
-SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2, 'Europe/Moscow');
+SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
 1925-01-01 02:00:00.00
-SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Europe/Moscow'));
+SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
 1925-01-01 02:00:00.000
-SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Europe/Moscow'));
+SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
 2282-12-31 03:00:00.000
-SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2, 'Europe/Moscow');
+SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
 2282-12-31 03:00:00.00
diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.sql b/tests/queries/0_stateless/01691_DateTime64_clamp.sql
index 2786d9c1c09..b7077aff1f7 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.sql
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.sql
@@ -1,17 +1,17 @@
 -- { echo }
 -- These values are within the extended range of DateTime64 [1925-01-01, 2284-01-01)
-SELECT toTimeZone(toDateTime(-2, 2), 'Europe/Moscow');
-SELECT toDateTime64(-2, 2, 'Europe/Moscow');
-SELECT CAST(-1 AS DateTime64(0, 'Europe/Moscow'));
-SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64(0, 'Europe/Moscow'));
-SELECT toDateTime64(bitShiftLeft(toUInt64(1), 33), 2, 'Europe/Moscow') FORMAT Null;
-SELECT toTimeZone(toDateTime(-2., 2), 'Europe/Moscow');
-SELECT toDateTime64(-2., 2, 'Europe/Moscow');
-SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow');
-SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Europe/Moscow') FORMAT Null;
+SELECT toTimeZone(toDateTime(-2, 2), 'Asia/Istanbul');
+SELECT toDateTime64(-2, 2, 'Asia/Istanbul');
+SELECT CAST(-1 AS DateTime64(0, 'Asia/Istanbul'));
+SELECT CAST('2020-01-01 00:00:00.3' AS DateTime64(0, 'Asia/Istanbul'));
+SELECT toDateTime64(bitShiftLeft(toUInt64(1), 33), 2, 'Asia/Istanbul') FORMAT Null;
+SELECT toTimeZone(toDateTime(-2., 2), 'Asia/Istanbul');
+SELECT toDateTime64(-2., 2, 'Asia/Istanbul');
+SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul');
+SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul') FORMAT Null;
 
 -- These are outsize of extended range and hence clamped
-SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2, 'Europe/Moscow');
-SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Europe/Moscow'));
-SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Europe/Moscow'));
-SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2, 'Europe/Moscow');
+SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
+SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
+SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
+SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01692_DateTime64_from_DateTime.reference b/tests/queries/0_stateless/01692_DateTime64_from_DateTime.reference
index 3473b027c22..3d85d7c68a8 100644
--- a/tests/queries/0_stateless/01692_DateTime64_from_DateTime.reference
+++ b/tests/queries/0_stateless/01692_DateTime64_from_DateTime.reference
@@ -1,5 +1,5 @@
-1970-01-01 03:00:01.00
-1970-01-01 03:00:01.00
+1970-01-01 02:00:01.00
+1970-01-01 02:00:01.00
 1970-01-02 00:00:00.00
 1970-01-01 00:00:01.00
 1970-01-02 00:00:00.00
diff --git a/tests/queries/0_stateless/01692_DateTime64_from_DateTime.sql b/tests/queries/0_stateless/01692_DateTime64_from_DateTime.sql
index fac0c341007..c08062a456c 100644
--- a/tests/queries/0_stateless/01692_DateTime64_from_DateTime.sql
+++ b/tests/queries/0_stateless/01692_DateTime64_from_DateTime.sql
@@ -1,7 +1,7 @@
-select toDateTime64(toDateTime(1, 'Europe/Moscow'), 2);
+select toDateTime64(toDateTime(1, 'Asia/Istanbul'), 2);
 select toDateTime64(toDate(1), 2) FORMAT Null; -- Unknown timezone
 select toDateTime64(toDateTime(1), 2) FORMAT Null; -- Unknown timezone
-select toDateTime64(toDateTime(1), 2, 'Europe/Moscow');
-select toDateTime64(toDate(1), 2, 'Europe/Moscow');
+select toDateTime64(toDateTime(1), 2, 'Asia/Istanbul');
+select toDateTime64(toDate(1), 2, 'Asia/Istanbul');
 select toDateTime64(toDateTime(1), 2, 'GMT');
 select toDateTime64(toDate(1), 2, 'GMT');
diff --git a/tests/queries/0_stateless/01698_fix_toMinute.reference b/tests/queries/0_stateless/01698_fix_toMinute.reference
index 7675aad3a57..eb1f7eb9ca1 100644
--- a/tests/queries/0_stateless/01698_fix_toMinute.reference
+++ b/tests/queries/0_stateless/01698_fix_toMinute.reference
@@ -19,6 +19,6 @@ Check the bug causing situation: the special Australia/Lord_Howe time zone. toDa
 1554569400	2019-04-07 03:20:00	2019-04-07 03:20:00
 1554570000	2019-04-07 03:30:00	2019-04-07 03:30:00
 1554570600	2019-04-07 03:40:00	2019-04-07 03:40:00
-4 days test in batch comparing with manually computation result for Europe/Moscow whose timezone epoc is of whole hour:
+4 days test in batch comparing with manually computation result for Asia/Istanbul whose timezone epoc is of whole hour:
 4 days test in batch comparing with manually computation result for Asia/Tehran whose timezone epoc is of half hour:
 4 days test in batch comparing with manually computation result for Australia/Lord_Howe whose timezone epoc is of half hour and also its DST offset is half hour:
diff --git a/tests/queries/0_stateless/01698_fix_toMinute.sql b/tests/queries/0_stateless/01698_fix_toMinute.sql
index f582806719d..4d11efa901d 100644
--- a/tests/queries/0_stateless/01698_fix_toMinute.sql
+++ b/tests/queries/0_stateless/01698_fix_toMinute.sql
@@ -3,9 +3,9 @@ SELECT 'Check the bug causing situation: the special Australia/Lord_Howe time zo
 SELECT toUnixTimestamp(x) as tt, (toDateTime('2019-04-07 01:00:00', 'Australia/Lord_Howe') + INTERVAL number * 600 SECOND) AS x,  toString(x) as xx FROM numbers(20);
 
 /* The Batch Part. Test period is whole 4 days*/
-SELECT '4 days test in batch comparing with manually computation result for Europe/Moscow whose timezone epoc is of whole hour:';
-SELECT toUnixTimestamp(x) as tt, (toDateTime('1981-04-01 00:00:00', 'Europe/Moscow') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
-SELECT toUnixTimestamp(x) as tt, (toDateTime('1981-09-30 00:00:00', 'Europe/Moscow') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+SELECT '4 days test in batch comparing with manually computation result for Asia/Istanbul whose timezone epoc is of whole hour:';
+SELECT toUnixTimestamp(x) as tt, (toDateTime('1981-04-01 00:00:00', 'Asia/Istanbul') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
+SELECT toUnixTimestamp(x) as tt, (toDateTime('1981-09-30 00:00:00', 'Asia/Istanbul') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
 
 SELECT '4 days test in batch comparing with manually computation result for Asia/Tehran whose timezone epoc is of half hour:';
 SELECT toUnixTimestamp(x) as tt, (toDateTime('2020-03-21 00:00:00', 'Asia/Tehran') + INTERVAL number * 600 SECOND) AS x, timezoneOffset(x) as res,(toDateTime(toString(x), 'UTC') - x ) AS calc FROM numbers(576) where res != calc;
diff --git a/tests/queries/0_stateless/01699_timezoneOffset.sql b/tests/queries/0_stateless/01699_timezoneOffset.sql
index 8cabb23c4de..8a664521a84 100644
--- a/tests/queries/0_stateless/01699_timezoneOffset.sql
+++ b/tests/queries/0_stateless/01699_timezoneOffset.sql
@@ -42,4 +42,3 @@ SELECT 'Tehran DST Years:';
 SELECT number, (toDateTime('1970-06-01 00:00:00', 'Asia/Tehran') + INTERVAL number YEAR) AS DST_Y, timezoneOffset(DST_Y) AS t FROM numbers(51) where t != 12600;
 SELECT 'Shanghai DST Years:';
 SELECT number, (toDateTime('1970-08-01 00:00:00', 'Asia/Shanghai') + INTERVAL number YEAR) AS DST_Y, timezoneOffset(DST_Y) AS t FROM numbers(51) where t != 28800;
-
diff --git a/tests/queries/0_stateless/01700_deltasum.sql b/tests/queries/0_stateless/01700_deltasum.sql
index 9f1404c6845..7cd2b352e23 100644
--- a/tests/queries/0_stateless/01700_deltasum.sql
+++ b/tests/queries/0_stateless/01700_deltasum.sql
@@ -3,7 +3,7 @@ select deltaSum(arrayJoin([1, 2, 3, 0, 3, 4]));
 select deltaSum(arrayJoin([1, 2, 3, 0, 3, 4, 2, 3]));
 select deltaSum(arrayJoin([1, 2, 3, 0, 3, 3, 3, 3, 3, 4, 2, 3]));
 select deltaSum(arrayJoin([1, 2, 3, 0, 0, 0, 0, 3, 3, 3, 3, 3, 4, 2, 3]));
-select deltaSumMerge(rows) from
+select deltaSumMerge(rows) as delta_sum from
 (
     select * from
     (
@@ -11,8 +11,8 @@ select deltaSumMerge(rows) from
         union all
         select deltaSumState(arrayJoin([4, 5])) as rows
     ) order by rows
-);
-select deltaSumMerge(rows) from
+) order by delta_sum;
+select deltaSumMerge(rows) as delta_sum from
 (
     select * from
     (
@@ -20,9 +20,9 @@ select deltaSumMerge(rows) from
         union all
         select deltaSumState(arrayJoin([0, 1])) as rows
     ) order by rows
-);
+) order by delta_sum;
 select deltaSum(arrayJoin([2.25, 3, 4.5]));
-select deltaSumMerge(rows) from
+select deltaSumMerge(rows) as delta_sum from
 (
     select * from
     (
@@ -30,8 +30,8 @@ select deltaSumMerge(rows) from
         union all
         select deltaSumState(arrayJoin([4.1, 5.1, 6.6])) as rows
     ) order by rows
-);
-select deltaSumMerge(rows) from
+) order by delta_sum;
+select deltaSumMerge(rows) as delta_sum from
 (
     select * from
     (
@@ -41,4 +41,4 @@ select deltaSumMerge(rows) from
         union all
         select deltaSumState(arrayJoin([4, 6])) as rows
     ) order by rows
-);
+) order by delta_sum;
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
index 14123414873..f27bf42c7a5 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
@@ -1,4 +1,4 @@
-1940-10-09 22:13:17.6
+1940-10-09 21:13:17.6
 2283-11-11 23:46:43.6
 2283-11-11 23:46:40.1
 1925-01-01 00:00:00.9
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
index f51a1bb2280..b0dbd1dfc84 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
@@ -1,4 +1,4 @@
-SELECT toString(toDateTime('-922337203.6854775808', 1, 'Europe/Moscow'));
-SELECT toString(toDateTime('9922337203.6854775808', 1, 'Europe/Moscow'));
-SELECT toDateTime64(CAST('10000000000.1' AS Decimal64(1)), 1, 'Europe/Moscow');
-SELECT toDateTime64(CAST('-10000000000.1' AS Decimal64(1)), 1, 'Europe/Moscow');
+SELECT toString(toDateTime('-922337203.6854775808', 1, 'Asia/Istanbul'));
+SELECT toString(toDateTime('9922337203.6854775808', 1, 'Asia/Istanbul'));
+SELECT toDateTime64(CAST('10000000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
+SELECT toDateTime64(CAST('-10000000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01731_async_task_queue_wait.sh b/tests/queries/0_stateless/01731_async_task_queue_wait.sh
index 6fdd676f336..e0babf3c6ff 100755
--- a/tests/queries/0_stateless/01731_async_task_queue_wait.sh
+++ b/tests/queries/0_stateless/01731_async_task_queue_wait.sh
@@ -8,5 +8,3 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # cancellation with async_socket_for_remote=1 (that ignores
 # max_distributed_connections)
 timeout --signal=SIGINT 1 ${CLICKHOUSE_CLIENT} --max_distributed_connections=1 --max_block_size=2  --interactive_delay=900000 -q "select number + sleep(0.3) as x from remote('127.{2,3}', system.numbers) settings max_block_size = 2" 2>&1 | grep "Empty task was returned from async task queue" || true
-
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.reference b/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.reference
index 4f3181ecce0..91760be0c34 100644
--- a/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.reference
+++ b/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.reference
@@ -2,7 +2,7 @@
 2	2005-03-18 01:58:31.222
 3	2005-03-18 01:58:31.222
 4	2005-03-18 01:58:31.222
-2005-03-18 04:58:31.222
-2005-03-18 04:58:31.222
-2005-03-18 04:58:31.222
+2005-03-18 03:58:31.222
+2005-03-18 03:58:31.222
+2005-03-18 03:58:31.222
 0
diff --git a/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.sql b/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.sql
index 88859177a92..7e7fe3f2e16 100644
--- a/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.sql
+++ b/tests/queries/0_stateless/01732_more_consistent_datetime64_parsing.sql
@@ -5,7 +5,7 @@ INSERT INTO t VALUES (3, '1111111111222');
 INSERT INTO t VALUES (4, '1111111111.222');
 SELECT * FROM t ORDER BY i;
 
-SELECT toDateTime64(1111111111.222, 3, 'Europe/Moscow');
-SELECT toDateTime64('1111111111.222', 3, 'Europe/Moscow');
-SELECT toDateTime64('1111111111222', 3, 'Europe/Moscow');
-SELECT ignore(toDateTime64(1111111111222, 3, 'Europe/Moscow')); -- This gives somewhat correct but unexpected result
+SELECT toDateTime64(1111111111.222, 3, 'Asia/Istanbul');
+SELECT toDateTime64('1111111111.222', 3, 'Asia/Istanbul');
+SELECT toDateTime64('1111111111222', 3, 'Asia/Istanbul');
+SELECT ignore(toDateTime64(1111111111222, 3, 'Asia/Istanbul')); -- This gives somewhat correct but unexpected result
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
index 1cd243675c6..5bb10220f7f 100755
--- a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
+++ b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
@@ -11,34 +11,47 @@ set -o errexit
 set -o pipefail
 
 echo "
-    DROP TABLE IF EXISTS storage_join_race;
-    CREATE TABLE storage_join_race (x UInt64, y UInt64) Engine = Join(ALL, FULL, x);
+	DROP TABLE IF EXISTS storage_join_race;
+	CREATE TABLE storage_join_race (x UInt64, y UInt64) Engine = Join(ALL, FULL, x);
 " | $CLICKHOUSE_CLIENT -n
 
 function read_thread_big()
 {
-    $CLICKHOUSE_CLIENT -n -q "SELECT * FROM ( SELECT number AS x FROM numbers(100000) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null"
+    while true; do 
+        echo "
+            SELECT * FROM ( SELECT number AS x FROM numbers(100000) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
 }
 
 function read_thread_small()
 {
-    $CLICKHOUSE_CLIENT -n -q "SELECT * FROM ( SELECT number AS x FROM numbers(10) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null"
+    while true; do 
+        echo "
+            SELECT * FROM ( SELECT number AS x FROM numbers(10) ) AS t1 ALL FULL JOIN storage_join_race USING (x) FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
 }
 
 function read_thread_select()
 {
-    $CLICKHOUSE_CLIENT -n -q "SELECT * FROM storage_join_race FORMAT Null"
+    while true; do
+        echo "
+            SELECT * FROM storage_join_race FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
 }
 
-export -f read_thread_big
-export -f read_thread_small
-export -f read_thread_select
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f read_thread_big;
+export -f read_thread_small;
+export -f read_thread_select;
 
 TIMEOUT=20
 
-clickhouse_client_loop_timeout $TIMEOUT read_thread_big 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT read_thread_small 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT read_thread_select 2> /dev/null &
+timeout $TIMEOUT bash -c read_thread_big 2> /dev/null &
+timeout $TIMEOUT bash -c read_thread_small 2> /dev/null &
+timeout $TIMEOUT bash -c read_thread_select 2> /dev/null &
 
 echo "
     INSERT INTO storage_join_race SELECT number AS x, number AS y FROM numbers (10000000);
diff --git a/tests/queries/0_stateless/01734_datetime64_from_float.reference b/tests/queries/0_stateless/01734_datetime64_from_float.reference
index eb96016311d..4021b6451aa 100644
--- a/tests/queries/0_stateless/01734_datetime64_from_float.reference
+++ b/tests/queries/0_stateless/01734_datetime64_from_float.reference
@@ -1,3 +1,3 @@
-2005-03-18 04:58:31.222
-2005-03-18 04:58:31.222
-2005-03-18 04:58:31.222
+2005-03-18 03:58:31.222
+2005-03-18 03:58:31.222
+2005-03-18 03:58:31.222
diff --git a/tests/queries/0_stateless/01734_datetime64_from_float.sql b/tests/queries/0_stateless/01734_datetime64_from_float.sql
index 416638a4a73..bb837c681e3 100644
--- a/tests/queries/0_stateless/01734_datetime64_from_float.sql
+++ b/tests/queries/0_stateless/01734_datetime64_from_float.sql
@@ -1,3 +1,3 @@
-SELECT CAST(1111111111.222 AS DateTime64(3, 'Europe/Moscow'));
-SELECT toDateTime(1111111111.222, 3, 'Europe/Moscow');
-SELECT toDateTime64(1111111111.222, 3, 'Europe/Moscow');
+SELECT CAST(1111111111.222 AS DateTime64(3, 'Asia/Istanbul'));
+SELECT toDateTime(1111111111.222, 3, 'Asia/Istanbul');
+SELECT toDateTime64(1111111111.222, 3, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01761_round_year_bounds.sql b/tests/queries/0_stateless/01761_round_year_bounds.sql
index fed12c55568..57f421d155e 100644
--- a/tests/queries/0_stateless/01761_round_year_bounds.sql
+++ b/tests/queries/0_stateless/01761_round_year_bounds.sql
@@ -1 +1 @@
-SELECT toStartOfInterval(toDateTime(-9223372036854775808), toIntervalYear(100), 'Europe/Moscow') FORMAT Null;
+SELECT toStartOfInterval(toDateTime(-9223372036854775808), toIntervalYear(100), 'Asia/Istanbul') FORMAT Null;
diff --git a/tests/queries/0_stateless/01769_extended_range_2.sql b/tests/queries/0_stateless/01769_extended_range_2.sql
index a2570c9397b..0b1319ddaea 100644
--- a/tests/queries/0_stateless/01769_extended_range_2.sql
+++ b/tests/queries/0_stateless/01769_extended_range_2.sql
@@ -1,3 +1,3 @@
 SELECT toDateTime64('1969-12-31 18:00:12', 0, 'America/Phoenix');
 SELECT toDateTime64('1969-12-30 18:00:12', 0, 'America/Phoenix');
-SELECT toDateTime64('1969-12-31 18:00:12', 0, 'Europe/Moscow');
+SELECT toDateTime64('1969-12-31 18:00:12', 0, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01780_column_sparse_full.reference b/tests/queries/0_stateless/01780_column_sparse_full.reference
index dbe815800a9..03160f24a41 100644
--- a/tests/queries/0_stateless/01780_column_sparse_full.reference
+++ b/tests/queries/0_stateless/01780_column_sparse_full.reference
@@ -39,7 +39,7 @@ all_2_2_0	u	Default
 0	0	0
 0	0	0
 0	0	0
-1	1	1
+1	0	
 ======
 58413
 57920
diff --git a/tests/queries/0_stateless/01780_column_sparse_full.sql b/tests/queries/0_stateless/01780_column_sparse_full.sql
index 59128223dba..c190e8f0df4 100644
--- a/tests/queries/0_stateless/01780_column_sparse_full.sql
+++ b/tests/queries/0_stateless/01780_column_sparse_full.sql
@@ -43,7 +43,7 @@ SELECT '======';
 SELECT toUInt32(s) % 5 AS k, groupUniqArray(u % 4) FROM t_sparse_full WHERE s != '' GROUP BY k ORDER BY k;
 SELECT max(range(id % 10)[u]) FROM t_sparse_full;
 SELECT '======';
-SELECT id, u, s FROM remote('127.0.0.{1,2}', currentDatabase(), t_sparse_full) ORDER BY id LIMIT 5;
+SELECT id, u, s FROM remote('127.0.0.{1,2}', currentDatabase(), t_sparse_full) ORDER BY id, u, s LIMIT 5;
 SELECT '======';
 SELECT sum(u) FROM t_sparse_full GROUP BY id % 3 AS k WITH TOTALS ORDER BY k;
 SELECT '======';
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.reference b/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
index cb5a3f1ff52..c593d1764ea 100644
--- a/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
@@ -45,8 +45,8 @@
 11	11
 12	12
 ===============
-88	11	11
 77	11	11
+88	11	11
 77	12	12
 ===============
 1	1	33
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
index 1e3b464da30..4a148c53957 100644
--- a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
@@ -103,7 +103,7 @@ INSERT INTO merge_tree_deduplication (key, value, part) VALUES (11, '11', 88); -
 INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11'); -- not deduplicated
 INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12'); -- not deduplicated
 
-SELECT part, key, value FROM merge_tree_deduplication ORDER BY key;
+SELECT part, key, value FROM merge_tree_deduplication ORDER BY key, part;
 
 -- Alters....
 
diff --git a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
index 75c114cdd74..bf717d7da0b 100644
--- a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
+++ b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
@@ -1,27 +1,27 @@
 -- { echo }
 
-SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
 19
-SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
 19
-SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
 19
-SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Asia/Istanbul'), '%C');
 20
-SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
 21
-SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
 22
 -- non-zero scale
-SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
 19
-SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
 19
-SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
 19
-SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Asia/Istanbul'), '%C');
 20
-SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
 21
-SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
 22
diff --git a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
index e368f45cbda..712afd28cd6 100644
--- a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
+++ b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
@@ -1,16 +1,16 @@
 -- { echo }
 
-SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Asia/Istanbul'), '%C');
 
 -- non-zero scale
-SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
-SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Europe/Moscow'), '%C');
\ No newline at end of file
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
+SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Asia/Istanbul'), '%C');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01802_toDateTime64_large_values.reference b/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
index c44c61ab93a..e60b1c30314 100644
--- a/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
+++ b/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
@@ -2,9 +2,9 @@
 
 SELECT toDateTime64('2205-12-12 12:12:12', 0, 'UTC');
 2205-12-12 12:12:12
-SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow');
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Asia/Istanbul');
 2205-12-12 12:12:12
-SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Asia/Istanbul');
 2205-12-12 12:12:12.000000
-SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Asia/Istanbul');
 2205-12-12 12:12:12.000000
diff --git a/tests/queries/0_stateless/01802_toDateTime64_large_values.sql b/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
index 299111f43bc..d82d4433b2d 100644
--- a/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
+++ b/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
@@ -1,7 +1,7 @@
 -- { echo }
 
 SELECT toDateTime64('2205-12-12 12:12:12', 0, 'UTC');
-SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow');
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Asia/Istanbul');
 
-SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
-SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
\ No newline at end of file
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Asia/Istanbul');
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Asia/Istanbul');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01811_datename.sql b/tests/queries/0_stateless/01811_datename.sql
index 0cd538b52c7..b757d9ae018 100644
--- a/tests/queries/0_stateless/01811_datename.sql
+++ b/tests/queries/0_stateless/01811_datename.sql
@@ -66,7 +66,7 @@ SELECT
 WITH
     toDateTime('2021-04-14 23:22:33', 'UTC') as date
 SELECT
-    dateName('weekday', date, 'Europe/Moscow'),
-    dateName('hour', date, 'Europe/Moscow'),
-    dateName('minute', date, 'Europe/Moscow'),
-    dateName('second', date, 'Europe/Moscow');
+    dateName('weekday', date, 'Asia/Istanbul'),
+    dateName('hour', date, 'Asia/Istanbul'),
+    dateName('minute', date, 'Asia/Istanbul'),
+    dateName('second', date, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.sql b/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
index 377291e015f..5ec767fe413 100644
--- a/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
+++ b/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
@@ -1,2 +1,2 @@
-SELECT toDateTime('9223372036854775806', 7, 'Europe/Moscow');
-SELECT toDateTime('9223372036854775806', 8, 'Europe/Moscow');
+SELECT toDateTime('9223372036854775806', 7, 'Asia/Istanbul');
+SELECT toDateTime('9223372036854775806', 8, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01852_map_combinator.reference b/tests/queries/0_stateless/01852_map_combinator.reference
index 4ad4ea8071e..a7a3a9b2f60 100644
--- a/tests/queries/0_stateless/01852_map_combinator.reference
+++ b/tests/queries/0_stateless/01852_map_combinator.reference
@@ -23,7 +23,7 @@ Map(UInt16, Float64)	{1:10,2:10,3:10,4:10,5:10,6:10,7:10,8:10}
 {'1':'1'}
 {1:1}
 {'1970-01-02':1}
-{'1970-01-01 03:00:01':1}
+{'1970-01-01 02:00:01':1}
 {'a':1}
 {'1':'2'}
 {1:1}
diff --git a/tests/queries/0_stateless/01852_map_combinator.sql b/tests/queries/0_stateless/01852_map_combinator.sql
index 3036e2e0ea4..a23a507bc27 100644
--- a/tests/queries/0_stateless/01852_map_combinator.sql
+++ b/tests/queries/0_stateless/01852_map_combinator.sql
@@ -26,7 +26,7 @@ select minMap(val) from values ('val Map(String, String)',  (map('1', '1')), (ma
 select minMap(val) from values ('val Map(FixedString(1), FixedString(1))',  (map('1', '1')), (map('1', '2')));
 select minMap(val) from values ('val Map(UInt64, UInt64)',  (map(1, 1)), (map(1, 2)));
 select minMap(val) from values ('val Map(Date, Int16)',  (map(1, 1)), (map(1, 2)));
-select minMap(val) from values ('val Map(DateTime(\'Europe/Moscow\'), Int32)',  (map(1, 1)), (map(1, 2)));
+select minMap(val) from values ('val Map(DateTime(\'Asia/Istanbul\'), Int32)',  (map(1, 1)), (map(1, 2)));
 select minMap(val) from values ('val Map(Enum16(\'a\'=1), Int16)',  (map('a', 1)), (map('a', 2)));
 select maxMap(val) from values ('val Map(String, String)',  (map('1', '1')), (map('1', '2')));
 select minMap(val) from values ('val Map(Int128, Int128)',  (map(1, 1)), (map(1, 2)));
diff --git a/tests/queries/0_stateless/01867_support_datetime64_version_column.sql b/tests/queries/0_stateless/01867_support_datetime64_version_column.sql
index 1aea0fb91f2..2f0ed1fdc7f 100644
--- a/tests/queries/0_stateless/01867_support_datetime64_version_column.sql
+++ b/tests/queries/0_stateless/01867_support_datetime64_version_column.sql
@@ -1,5 +1,5 @@
 drop table if exists replacing;
-create table replacing(    `A` Int64,    `D` DateTime64(9, 'Europe/Moscow'),    `S` String)    ENGINE = ReplacingMergeTree(D) ORDER BY A;
+create table replacing(    `A` Int64,    `D` DateTime64(9, 'Asia/Istanbul'),    `S` String)    ENGINE = ReplacingMergeTree(D) ORDER BY A;
 
 insert into replacing values (1,'1970-01-01 08:25:46.300800000','a');
 insert into replacing values (2,'1970-01-01 08:25:46.300800002','b');
diff --git a/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
index 1b3a86ea2c4..05c3acb4aea 100644
--- a/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
+++ b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
@@ -1,14 +1,14 @@
-1970-01-01 03:16:40.000	original
-1970-01-01 03:33:20.000	
-1970-01-01 03:50:00.000	
-1970-01-01 04:06:40.000	original
-1970-01-01 04:23:20.000	
-1970-01-01 04:40:00.000	
-1970-01-01 04:56:40.000	original
-1970-01-01 03:16:40.000000000	original
-1970-01-01 03:33:20.000000000	
-1970-01-01 03:50:00.000000000	
-1970-01-01 04:06:40.000000000	original
-1970-01-01 04:23:20.000000000	
-1970-01-01 04:40:00.000000000	
-1970-01-01 04:56:40.000000000	original
+1970-01-01 02:16:40.000	original
+1970-01-01 02:33:20.000	
+1970-01-01 02:50:00.000	
+1970-01-01 03:06:40.000	original
+1970-01-01 03:23:20.000	
+1970-01-01 03:40:00.000	
+1970-01-01 03:56:40.000	original
+1970-01-01 02:16:40.000000000	original
+1970-01-01 02:33:20.000000000	
+1970-01-01 02:50:00.000000000	
+1970-01-01 03:06:40.000000000	original
+1970-01-01 03:23:20.000000000	
+1970-01-01 03:40:00.000000000	
+1970-01-01 03:56:40.000000000	original
diff --git a/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
index ff3134d37ed..3a49ef73d1a 100644
--- a/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
+++ b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
@@ -1,2 +1,2 @@
-SELECT n, source FROM (SELECT  toDateTime64(number * 1000, 3,'Europe/Moscow') AS n, 'original' AS source  FROM numbers(10)  WHERE (number % 3) = 1 ) ORDER BY n ASC WITH FILL STEP toDateTime64(1000, 3);
-SELECT n, source FROM (SELECT  toDateTime64(number * 1000, 9,'Europe/Moscow') AS n, 'original' AS source  FROM numbers(10)  WHERE (number % 3) = 1 ) ORDER BY n ASC WITH FILL STEP toDateTime64(1000, 9);
+SELECT n, source FROM (SELECT  toDateTime64(number * 1000, 3,'Asia/Istanbul') AS n, 'original' AS source  FROM numbers(10)  WHERE (number % 3) = 1 ) ORDER BY n ASC WITH FILL STEP toDateTime64(1000, 3);
+SELECT n, source FROM (SELECT  toDateTime64(number * 1000, 9,'Asia/Istanbul') AS n, 'original' AS source  FROM numbers(10)  WHERE (number % 3) = 1 ) ORDER BY n ASC WITH FILL STEP toDateTime64(1000, 9);
diff --git a/tests/queries/0_stateless/01883_grouping_sets_crash.reference b/tests/queries/0_stateless/01883_grouping_sets_crash.reference
index 4d9e967b766..c7c3eb1c977 100644
--- a/tests/queries/0_stateless/01883_grouping_sets_crash.reference
+++ b/tests/queries/0_stateless/01883_grouping_sets_crash.reference
@@ -1,3 +1,14 @@
+-- { echoOn }
+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;
 0	0
 1	1
 2	2
@@ -9,7 +20,23 @@
 8	8
 9	9
 10	10
+SELECT 'SECOND QUERY:';
 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;
 0	0
 0	0
 0	0
@@ -32,7 +59,26 @@ SECOND QUERY:
 8	8
 9	9
 10	10
+SELECT 'THIRD QUERY:';
 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;
 \N	1	0	0
 \N	2	0	0
 \N	3	0	0
@@ -154,6 +200,11 @@ THIRD QUERY:
 \N	0	0	0
 \N	0	0	0
 \N	0	0	0
+SELECT fact_3_id
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS ((fact_3_id, fact_4_id))
+ORDER BY fact_3_id ASC;
 1
 2
 3
@@ -164,6 +215,24 @@ THIRD QUERY:
 8
 9
 10
+-- 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;
 w\0\0ldworldwo\0l\0world
 w\0\0ldworldwo\0l\0world
 w\0\0ldworldwo\0l\0world
@@ -185,6 +254,15 @@ w\0\0ldworldwo\0l\0world
 w\0\0ldworldwo\0l\0world
 w\0\0ldworldwo\0l\0world
 w\0\0ldworldwo\0l\0world
+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;
 0
 0
 0
@@ -207,3 +285,76 @@ w\0\0ldworldwo\0l\0world
 8
 9
 10
+SELECT fact_3_id, fact_4_id, count()
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    ( fact_3_id, fact_4_id))
+ORDER BY fact_3_id, fact_4_id
+SETTINGS optimize_aggregation_in_order=1;
+1	1	100
+2	2	100
+3	3	100
+4	4	100
+5	5	100
+6	6	100
+7	7	100
+8	8	100
+9	9	100
+10	10	100
+SELECT fact_3_id, fact_4_id, count()
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    fact_3_id,
+    fact_4_id)
+ORDER BY fact_3_id, fact_4_id
+SETTINGS optimize_aggregation_in_order=1;
+0	1	100
+0	2	100
+0	3	100
+0	4	100
+0	5	100
+0	6	100
+0	7	100
+0	8	100
+0	9	100
+0	10	100
+1	0	100
+2	0	100
+3	0	100
+4	0	100
+5	0	100
+6	0	100
+7	0	100
+8	0	100
+9	0	100
+10	0	100
+SELECT fact_3_id, fact_4_id, count()
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    ( fact_3_id ),
+    ( fact_3_id, fact_4_id))
+ORDER BY fact_3_id, fact_4_id
+SETTINGS optimize_aggregation_in_order=1;
+1	0	100
+1	1	100
+2	0	100
+2	2	100
+3	0	100
+3	3	100
+4	0	100
+4	4	100
+5	0	100
+5	5	100
+6	0	100
+6	6	100
+7	0	100
+7	7	100
+8	0	100
+8	8	100
+9	0	100
+9	9	100
+10	0	100
+10	10	100
diff --git a/tests/queries/0_stateless/01883_grouping_sets_crash.sql b/tests/queries/0_stateless/01883_grouping_sets_crash.sql
index cf56c8546ce..4cbd7c8f225 100644
--- a/tests/queries/0_stateless/01883_grouping_sets_crash.sql
+++ b/tests/queries/0_stateless/01883_grouping_sets_crash.sql
@@ -11,6 +11,7 @@ SELECT
        number % 100 AS sales_value
 FROM system.numbers limit 1000;
 
+-- { echoOn }
 SELECT
     fact_3_id,
     fact_4_id
@@ -96,4 +97,31 @@ GROUP BY
     ( 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
+SELECT fact_3_id, fact_4_id, count()
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    ( fact_3_id, fact_4_id))
+ORDER BY fact_3_id, fact_4_id
+SETTINGS optimize_aggregation_in_order=1;
+
+SELECT fact_3_id, fact_4_id, count()
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    fact_3_id,
+    fact_4_id)
+ORDER BY fact_3_id, fact_4_id
+SETTINGS optimize_aggregation_in_order=1;
+
+SELECT fact_3_id, fact_4_id, count()
+FROM grouping_sets
+GROUP BY
+    GROUPING SETS (
+    ( fact_3_id ),
+    ( fact_3_id, fact_4_id))
+ORDER BY fact_3_id, fact_4_id
+SETTINGS optimize_aggregation_in_order=1;
+
+-- { echoOff }
+DROP TABLE IF EXISTS grouping_sets;
diff --git a/tests/queries/0_stateless/01891_partition_hash.sql b/tests/queries/0_stateless/01891_partition_hash.sql
index f401c7c2d07..f56ed6a4ff4 100644
--- a/tests/queries/0_stateless/01891_partition_hash.sql
+++ b/tests/queries/0_stateless/01891_partition_hash.sql
@@ -1,5 +1,5 @@
 drop table if exists tab;
-create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, i128 Int128, i256 Int256, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, u128 UInt128, u256 UInt256, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Europe/Moscow'), dt64 DateTime64(3, 'Europe/Moscow'), dec128 Decimal128(3), dec256 Decimal256(4), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, i128, i256, u8, u16, u32, u64, u128, u256, id, s, fs, a, t, d, dt, dt64, dec128, dec256, lc) order by tuple();
+create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, i128 Int128, i256 Int256, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, u128 UInt128, u256 UInt256, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Asia/Istanbul'), dt64 DateTime64(3, 'Asia/Istanbul'), dec128 Decimal128(3), dec256 Decimal256(4), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, i128, i256, u8, u16, u32, u64, u128, u256, id, s, fs, a, t, d, dt, dt64, dec128, dec256, lc) order by tuple();
 insert into tab values (-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', '78.9101', 'a');
 -- Here we check that partition id did not change.
 -- Different result means Backward Incompatible Change. Old partitions will not be accepted by new server.
diff --git a/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql b/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
index 643266f1ea3..431f566b806 100644
--- a/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
+++ b/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
@@ -1,7 +1,7 @@
 -- Tags: long
 
 drop table if exists tab;
-create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Europe/Moscow'), dt64 DateTime64(3, 'Europe/Moscow'), dec128 Decimal128(3), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, u8, u16, u32, u64, id, s, fs, a, t, d, dt, dt64, dec128, lc) order by tuple();
+create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Asia/Istanbul'), dt64 DateTime64(3, 'Asia/Istanbul'), dec128 Decimal128(3), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, u8, u16, u32, u64, id, s, fs, a, t, d, dt, dt64, dec128, lc) order by tuple();
 insert into tab values (-1, -1, -1, -1, -1, -1, -1, -1, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', 'a');
 -- Here we check that partition id did not change.
 -- Different result means Backward Incompatible Change. Old partitions will not be accepted by new server.
diff --git a/tests/queries/0_stateless/01905_to_json_string.reference b/tests/queries/0_stateless/01905_to_json_string.reference
index e669022f208..33d435f8e1a 100644
--- a/tests/queries/0_stateless/01905_to_json_string.reference
+++ b/tests/queries/0_stateless/01905_to_json_string.reference
@@ -1,3 +1,3 @@
-[]	2947817982	"&"	-69802.9769	"w"	-1.9158530982937093e25	["2003-05-15","1988-03-19 07:13:49","2090-04-14 03:58:26.029","91943d2e-480d-66b5-ee4c-1b5bb8eb7256"]	"�O"	[]
+[]	2947817982	"&"	-69802.9769	"w"	-1.9158530982937093e25	["2003-05-15","1988-03-19 06:13:49","2090-04-14 03:58:26.029","91943d2e-480d-66b5-ee4c-1b5bb8eb7256"]	"�O"	[]
 [-115]	481807067	",{MM"	-170235.0663	"o"	3.3808659558052087e155	["2055-01-12","2070-08-09 03:49:21","2068-11-30 09:36:49.672","20b0e7b5-ad0e-177b-3054-c779b2a8ebe0"]	"I\\u001C"	["e57178f9-4d10-2fa1-7c2d-53c5a65c3463"]
 {"1234":"5678"}
diff --git a/tests/queries/0_stateless/01905_to_json_string.sql b/tests/queries/0_stateless/01905_to_json_string.sql
index e92c32f3422..38c02ef13fb 100644
--- a/tests/queries/0_stateless/01905_to_json_string.sql
+++ b/tests/queries/0_stateless/01905_to_json_string.sql
@@ -8,7 +8,7 @@ $$
     d Decimal32(4),
     e Nullable(Enum16('h' = 1, 'w' = 5 , 'o' = -200)),
     f Float64,
-    g Tuple(Date, DateTime('Europe/Moscow'), DateTime64(3, 'Europe/Moscow'), UUID),
+    g Tuple(Date, DateTime('Asia/Istanbul'), DateTime64(3, 'Asia/Istanbul'), UUID),
     h FixedString(2),
     i Array(Nullable(UUID))
 $$, 10, 5, 3) limit 2;
diff --git a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
index a29d0661621..a3682a3a74b 100755
--- a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
@@ -29,34 +29,38 @@ done
 
 function optimize_thread
 {
-    REPLICA=$(($RANDOM % 5 + 1))
-    $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE ttl_table$REPLICA FINAl"
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE ttl_table$REPLICA FINAl"
+    done
 }
 
 function insert_thread
 {
-    REPLICA=$(($RANDOM % 5 + 1))
-    $CLICKHOUSE_CLIENT --optimize_on_insert=0 --query "INSERT INTO ttl_table$REPLICA SELECT now() + rand() % 5 - rand() % 3 FROM numbers(5)"
-    $CLICKHOUSE_CLIENT --optimize_on_insert=0 --query "INSERT INTO ttl_table$REPLICA SELECT now() + rand() % 5 - rand() % 3 FROM numbers(5)"
-    $CLICKHOUSE_CLIENT --optimize_on_insert=0 --query "INSERT INTO ttl_table$REPLICA SELECT now() + rand() % 5 - rand() % 3 FROM numbers(5)"
+    while true; do
+        REPLICA=$(($RANDOM % 5 + 1))
+        $CLICKHOUSE_CLIENT --optimize_on_insert=0 --query "INSERT INTO ttl_table$REPLICA SELECT now() + rand() % 5 - rand() % 3 FROM numbers(5)"
+        $CLICKHOUSE_CLIENT --optimize_on_insert=0 --query "INSERT INTO ttl_table$REPLICA SELECT now() + rand() % 5 - rand() % 3 FROM numbers(5)"
+        $CLICKHOUSE_CLIENT --optimize_on_insert=0 --query "INSERT INTO ttl_table$REPLICA SELECT now() + rand() % 5 - rand() % 3 FROM numbers(5)"
+    done
 }
 
 
-export -f insert_thread
-export -f optimize_thread
+export -f insert_thread;
+export -f optimize_thread;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT insert_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
 
 wait
 for i in $(seq 1 $NUM_REPLICAS); do
diff --git a/tests/queries/0_stateless/01921_datatype_date32.reference b/tests/queries/0_stateless/01921_datatype_date32.reference
index fc76ba92dc4..a6b03123b33 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.reference
+++ b/tests/queries/0_stateless/01921_datatype_date32.reference
@@ -45,8 +45,8 @@
 -------toStartOfDay---------
 2061-02-06 07:28:16
 2061-02-06 07:28:16
-2010-10-17 12:03:28
-2011-08-28 12:03:28
+2010-10-17 11:03:28
+2011-08-28 11:03:28
 2021-06-22 00:00:00
 -------toMonday---------
 2104-06-04
@@ -145,8 +145,8 @@
 49099
 18800
 -------toRelativeHourNum---------
-4294572851
-4294572851
+4294572852
+4294572852
 2743677
 2751237
 451197
diff --git a/tests/queries/0_stateless/01921_datatype_date32.sql b/tests/queries/0_stateless/01921_datatype_date32.sql
index 3ab026faab9..0805b94a9fe 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.sql
+++ b/tests/queries/0_stateless/01921_datatype_date32.sql
@@ -23,7 +23,7 @@ select toMinute(x1) from t1; -- { serverError 43 }
 select '-------toSecond---------';
 select toSecond(x1) from t1; -- { serverError 43 }
 select '-------toStartOfDay---------';
-select toStartOfDay(x1, 'Europe/Moscow') from t1;
+select toStartOfDay(x1, 'Asia/Istanbul') from t1;
 select '-------toMonday---------';
 select toMonday(x1) from t1;
 select '-------toISOWeek---------';
@@ -57,21 +57,21 @@ select toStartOfHour(x1) from t1; -- { serverError 43 }
 select '-------toStartOfISOYear---------';
 select toStartOfISOYear(x1) from t1;
 select '-------toRelativeYearNum---------';
-select toRelativeYearNum(x1, 'Europe/Moscow') from t1;
+select toRelativeYearNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeQuarterNum---------';
-select toRelativeQuarterNum(x1, 'Europe/Moscow') from t1;
+select toRelativeQuarterNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeMonthNum---------';
-select toRelativeMonthNum(x1, 'Europe/Moscow') from t1;
+select toRelativeMonthNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeWeekNum---------';
-select toRelativeWeekNum(x1, 'Europe/Moscow') from t1;
+select toRelativeWeekNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeDayNum---------';
-select toRelativeDayNum(x1, 'Europe/Moscow') from t1;
+select toRelativeDayNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeHourNum---------';
-select toRelativeHourNum(x1, 'Europe/Moscow') from t1;
+select toRelativeHourNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeMinuteNum---------';
-select toRelativeMinuteNum(x1, 'Europe/Moscow') from t1;
+select toRelativeMinuteNum(x1, 'Asia/Istanbul') from t1;
 select '-------toRelativeSecondNum---------';
-select toRelativeSecondNum(x1, 'Europe/Moscow') from t1;
+select toRelativeSecondNum(x1, 'Asia/Istanbul') from t1;
 select '-------toTime---------';
 select toTime(x1) from t1; -- { serverError 43 }
 select '-------toYYYYMM---------';
diff --git a/tests/queries/0_stateless/01925_date_date_time_comparison.sql b/tests/queries/0_stateless/01925_date_date_time_comparison.sql
index 13e856384d2..0659d85b028 100644
--- a/tests/queries/0_stateless/01925_date_date_time_comparison.sql
+++ b/tests/queries/0_stateless/01925_date_date_time_comparison.sql
@@ -1,2 +1,2 @@
-SELECT toDate('2000-01-01') < toDateTime('2000-01-01 00:00:01', 'Europe/Moscow');
-SELECT toDate('2000-01-01') < toDateTime64('2000-01-01 00:00:01', 0, 'Europe/Moscow');
+SELECT toDate('2000-01-01') < toDateTime('2000-01-01 00:00:01', 'Asia/Istanbul');
+SELECT toDate('2000-01-01') < toDateTime64('2000-01-01 00:00:01', 0, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01926_date_date_time_supertype.reference b/tests/queries/0_stateless/01926_date_date_time_supertype.reference
index ec9933dfbd2..e4e8ddfceab 100644
--- a/tests/queries/0_stateless/01926_date_date_time_supertype.reference
+++ b/tests/queries/0_stateless/01926_date_date_time_supertype.reference
@@ -1,12 +1,12 @@
 Array
-Array(DateTime(\'Europe/Moscow\'))
-Array(DateTime64(5, \'Europe/Moscow\'))
-Array(DateTime64(6, \'Europe/Moscow\'))
+Array(DateTime(\'Asia/Istanbul\'))
+Array(DateTime64(5, \'Asia/Istanbul\'))
+Array(DateTime64(6, \'Asia/Istanbul\'))
 If
-2000-01-01 00:00:00	DateTime(\'Europe/Moscow\')
-2000-01-01 00:00:00	DateTime(\'Europe/Moscow\')
-2000-01-01 00:00:00.00000	DateTime64(5, \'Europe/Moscow\')
-2000-01-01 00:00:00.00000	DateTime64(5, \'Europe/Moscow\')
+2000-01-01 00:00:00	DateTime(\'Asia/Istanbul\')
+2000-01-01 00:00:00	DateTime(\'Asia/Istanbul\')
+2000-01-01 00:00:00.00000	DateTime64(5, \'Asia/Istanbul\')
+2000-01-01 00:00:00.00000	DateTime64(5, \'Asia/Istanbul\')
 Cast
 2000-01-01 00:00:00	DateTime(\'UTC\')
 2000-01-01 00:00:00.00000	DateTime64(5, \'UTC\')
diff --git a/tests/queries/0_stateless/01926_date_date_time_supertype.sql b/tests/queries/0_stateless/01926_date_date_time_supertype.sql
index cce488a5cff..756fd04a01f 100644
--- a/tests/queries/0_stateless/01926_date_date_time_supertype.sql
+++ b/tests/queries/0_stateless/01926_date_date_time_supertype.sql
@@ -1,8 +1,8 @@
 SELECT 'Array';
 
-SELECT toTypeName([toDate('2000-01-01'), toDateTime('2000-01-01', 'Europe/Moscow')]);
-SELECT toTypeName([toDate('2000-01-01'), toDateTime('2000-01-01', 'Europe/Moscow'), toDateTime64('2000-01-01', 5, 'Europe/Moscow')]);
-SELECT toTypeName([toDate('2000-01-01'), toDateTime('2000-01-01', 'Europe/Moscow'), toDateTime64('2000-01-01', 5, 'Europe/Moscow'), toDateTime64('2000-01-01', 6, 'Europe/Moscow')]);
+SELECT toTypeName([toDate('2000-01-01'), toDateTime('2000-01-01', 'Asia/Istanbul')]);
+SELECT toTypeName([toDate('2000-01-01'), toDateTime('2000-01-01', 'Asia/Istanbul'), toDateTime64('2000-01-01', 5, 'Asia/Istanbul')]);
+SELECT toTypeName([toDate('2000-01-01'), toDateTime('2000-01-01', 'Asia/Istanbul'), toDateTime64('2000-01-01', 5, 'Asia/Istanbul'), toDateTime64('2000-01-01', 6, 'Asia/Istanbul')]);
 
 DROP TABLE IF EXISTS predicate_table;
 CREATE TABLE predicate_table (value UInt8) ENGINE=TinyLog;
@@ -11,11 +11,11 @@ INSERT INTO predicate_table VALUES (0), (1);
 
 SELECT 'If';
 
-WITH toDate('2000-01-01') as a, toDateTime('2000-01-01', 'Europe/Moscow') as b
+WITH toDate('2000-01-01') as a, toDateTime('2000-01-01', 'Asia/Istanbul') as b
 SELECT if(value, b, a) as result, toTypeName(result)
 FROM predicate_table;
 
-WITH toDateTime('2000-01-01', 'Europe/Moscow') as a, toDateTime64('2000-01-01', 5, 'Europe/Moscow') as b
+WITH toDateTime('2000-01-01', 'Asia/Istanbul') as a, toDateTime64('2000-01-01', 5, 'Asia/Istanbul') as b
 SELECT if(value, b, a) as result, toTypeName(result)
 FROM predicate_table;
 
diff --git a/tests/queries/0_stateless/02000_join_on_const.reference b/tests/queries/0_stateless/02000_join_on_const.reference
index b9494e4689c..3035351fd87 100644
--- a/tests/queries/0_stateless/02000_join_on_const.reference
+++ b/tests/queries/0_stateless/02000_join_on_const.reference
@@ -4,6 +4,7 @@
 1
 1
 1
+1
 - ON NULL -
 - inner -
 - left -
diff --git a/tests/queries/0_stateless/02000_join_on_const.sql b/tests/queries/0_stateless/02000_join_on_const.sql
index f6d686cf9bc..92ded98b5f4 100644
--- a/tests/queries/0_stateless/02000_join_on_const.sql
+++ b/tests/queries/0_stateless/02000_join_on_const.sql
@@ -13,8 +13,8 @@ SELECT 70 = 10 * sum(t1.id) + sum(t2.id) AND count() == 4 FROM t1 JOIN t2 ON 2 =
 SELECT 70 = 10 * sum(t1.id) + sum(t2.id) AND count() == 4 FROM t1 INNER ANY JOIN t2 ON toNullable(1);
 SELECT 70 = 10 * sum(t1.id) + sum(t2.id) AND count() == 4 FROM t1 INNER ANY JOIN t2 ON toLowCardinality(1);
 SELECT 70 = 10 * sum(t1.id) + sum(t2.id) AND count() == 4 FROM t1 INNER ANY JOIN t2 ON toLowCardinality(toNullable(1));
+SELECT 70 = 10 * sum(t1.id) + sum(t2.id) AND count() == 4 FROM t1 INNER ANY JOIN t2 ON toNullable(toLowCardinality(1));
 
-SELECT * FROM t1 INNER ANY JOIN t2 ON toNullable(toLowCardinality(1)); -- { serverError 403 }
 SELECT * FROM t1 INNER ANY JOIN t2 ON toUInt16(1); -- { serverError 403 }
 SELECT * FROM t1 INNER ANY JOIN t2 ON toInt8(1); -- { serverError 403 }
 SELECT * FROM t1 INNER ANY JOIN t2 ON 256; -- { serverError 403 }
diff --git a/tests/queries/0_stateless/02015_async_inserts_stress_long.sh b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
index c6f40d35855..086419baa61 100755
--- a/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
+++ b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
@@ -37,18 +37,24 @@ function insert3()
 
 function select1()
 {
-    ${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts FORMAT Null"
+    while true; do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts FORMAT Null"
+    done
 }
 
 function select2()
 {
-    ${CLICKHOUSE_CLIENT} -q "SELECT * FROM system.asynchronous_inserts FORMAT Null"
+    while true; do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM system.asynchronous_inserts FORMAT Null"
+    done
 }
 
 function truncate1()
 {
-    sleep 0.1
-    ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE async_inserts"
+    while true; do
+        sleep 0.1
+        ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE async_inserts"
+    done
 }
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
@@ -69,14 +75,11 @@ for _ in {1..5}; do
     timeout $TIMEOUT bash -c insert3 &
 done
 
-clickhouse_client_loop_timeout $TIMEOUT select1 &
-clickhouse_client_loop_timeout $TIMEOUT select2 &
-clickhouse_client_loop_timeout $TIMEOUT truncate1 &
+timeout $TIMEOUT bash -c select1 &
+timeout $TIMEOUT bash -c select2 &
+timeout $TIMEOUT bash -c truncate1 &
 
 wait
 echo "OK"
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts";
-
-# There is no other way to wait HTTP queries
-clickhouse_test_wait_queries 30
diff --git a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
index 062b8512bff..57a263abac5 100755
--- a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
+++ b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
@@ -19,24 +19,26 @@ $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zst
 
 function select_thread()
 {
-    $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM local" >/dev/null
-    $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM distributed" >/dev/null
+    while true; do
+        $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM local" >/dev/null
+        $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM distributed" >/dev/null
+    done
 }
 
-export -f select_thread
+export -f select_thread;
 
 TIMEOUT=30
 
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/02030_rocksdb_race_long.sh b/tests/queries/0_stateless/02030_rocksdb_race_long.sh
index ec20007892a..88c30852c86 100755
--- a/tests/queries/0_stateless/02030_rocksdb_race_long.sh
+++ b/tests/queries/0_stateless/02030_rocksdb_race_long.sh
@@ -11,29 +11,38 @@ set -o errexit
 set -o pipefail
 
 echo "
-    DROP TABLE IF EXISTS rocksdb_race;
-    CREATE TABLE rocksdb_race (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key);
+	DROP TABLE IF EXISTS rocksdb_race;
+	CREATE TABLE rocksdb_race (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     INSERT INTO rocksdb_race SELECT '1_' || toString(number), number FROM numbers(100000);
 " | $CLICKHOUSE_CLIENT -n
 
 function read_stat_thread()
 {
-    $CLICKHOUSE_CLIENT -n -q 'SELECT * FROM system.rocksdb FORMAT Null'
+    while true; do
+        echo "
+            SELECT * FROM system.rocksdb FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
 }
 
 function truncate_thread()
 {
-    sleep 3s;
-    $CLICKHOUSE_CLIENT -n -q 'TRUNCATE TABLE rocksdb_race'
+    while true; do
+        sleep 3s;
+        echo "
+            TRUNCATE TABLE rocksdb_race;
+        " | $CLICKHOUSE_CLIENT -n
+    done
 }
 
-export -f read_stat_thread
-export -f truncate_thread
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f read_stat_thread;
+export -f truncate_thread;
 
 TIMEOUT=20
 
-clickhouse_client_loop_timeout $TIMEOUT read_stat_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT truncate_thread 2> /dev/null &
+timeout $TIMEOUT bash -c read_stat_thread 2> /dev/null &
+timeout $TIMEOUT bash -c truncate_thread 2> /dev/null &
 
 wait
 
diff --git a/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.sql b/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.sql
index 9a25f2b007b..05e5a090d86 100644
--- a/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.sql
+++ b/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.sql
@@ -1 +1 @@
-select toDate32(toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')), toDateTime64(toDate32('2019-01-01'), 3, 'Europe/Moscow')
\ No newline at end of file
+select toDate32(toDateTime64('2019-01-01 00:00:00', 3, 'Asia/Istanbul')), toDateTime64(toDate32('2019-01-01'), 3, 'Asia/Istanbul')
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh b/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh
index 4b7d15c01c3..7e8579f7cbe 100755
--- a/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh
+++ b/tests/queries/0_stateless/02044_url_glob_parallel_connection_refused.sh
@@ -7,15 +7,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 i=0 retries=5
-client_opts=(
-    --http_max_tries 1
-    --max_execution_time 3
-    --max_threads 10
-    --query "SELECT * FROM url('http://128.0.0.{1..10}:${CLICKHOUSE_PORT_HTTP}/?query=SELECT+sleep(1)', TSV, 'x UInt8')"
-    --format Null
-)
 # Connecting to wrong address and checking for race condition
 while [[ $i -lt $retries ]]; do
-    clickhouse_client_timeout 4s ${CLICKHOUSE_CLIENT} "${client_opts[@]}" 2>/dev/null
+    timeout 5s ${CLICKHOUSE_CLIENT} --max_threads 10 --query "SELECT * FROM url('http://128.0.0.{1..10}:${CLICKHOUSE_PORT_HTTP}/?query=SELECT+sleep(1)', TSV, 'x UInt8')" --format Null 2>/dev/null
     ((++i))
 done
diff --git a/tests/queries/0_stateless/02096_date_time_1970_saturation.reference b/tests/queries/0_stateless/02096_date_time_1970_saturation.reference
index 3c073b9262e..2c5be5b91cd 100644
--- a/tests/queries/0_stateless/02096_date_time_1970_saturation.reference
+++ b/tests/queries/0_stateless/02096_date_time_1970_saturation.reference
@@ -1,5 +1,5 @@
 1970-01-01
-1970-01-01 03:00:00
+1970-01-01 02:00:00
 1970-01-01
 1970-01-01
 1970-01-01
@@ -10,12 +10,12 @@
 1970-01-01
 1970-01-01
 1970-01-01
-1970-01-02 03:00:00
-1970-01-01 03:00:00
-1970-01-01 03:00:00
-1970-01-01 03:00:00
-1970-01-01 03:00:00
-1970-01-01 03:00:00
+1970-01-02 02:00:00
+1970-01-01 02:00:00
+1970-01-01 02:00:00
+1970-01-01 02:00:00
+1970-01-01 02:00:00
+1970-01-01 02:00:00
 1969-12-31 16:00:00
 1970-01-01
 1970-01-01
diff --git a/tests/queries/0_stateless/02096_date_time_1970_saturation.sql b/tests/queries/0_stateless/02096_date_time_1970_saturation.sql
index 8cf60c95f73..2587b900642 100644
--- a/tests/queries/0_stateless/02096_date_time_1970_saturation.sql
+++ b/tests/queries/0_stateless/02096_date_time_1970_saturation.sql
@@ -1,22 +1,21 @@
 select toDate(0);
-select toDateTime(0, 'Europe/Moscow');
+select toDateTime(0, 'Asia/Istanbul');
 select toMonday(toDate(0));
-select toMonday(toDateTime(0, 'Europe/Moscow'));
+select toMonday(toDateTime(0, 'Asia/Istanbul'));
 select toStartOfWeek(toDate(0));
-select toStartOfWeek(toDateTime(0, 'Europe/Moscow'));
+select toStartOfWeek(toDateTime(0, 'Asia/Istanbul'));
 select toStartOfMonth(toDate(0));
-select toStartOfMonth(toDateTime(0, 'Europe/Moscow'));
+select toStartOfMonth(toDateTime(0, 'Asia/Istanbul'));
 select toStartOfQuarter(toDate(0));
-select toStartOfQuarter(toDateTime(0, 'Europe/Moscow'));
+select toStartOfQuarter(toDateTime(0, 'Asia/Istanbul'));
 select toStartOfYear(toDate(0));
-select toStartOfYear(toDateTime(0, 'Europe/Moscow'));
-select toTime(toDateTime(0, 'Europe/Moscow'));
-select toStartOfMinute(toDateTime(0, 'Europe/Moscow'));
-select toStartOfFiveMinutes(toDateTime(0, 'Europe/Moscow'));
-select toStartOfTenMinutes(toDateTime(0, 'Europe/Moscow'));
-select toStartOfFifteenMinutes(toDateTime(0, 'Europe/Moscow'));
-select toStartOfHour(toDateTime(0, 'Europe/Moscow'));
-
+select toStartOfYear(toDateTime(0, 'Asia/Istanbul'));
+select toTime(toDateTime(0, 'Asia/Istanbul'));
+select toStartOfMinute(toDateTime(0, 'Asia/Istanbul'));
+select toStartOfFiveMinutes(toDateTime(0, 'Asia/Istanbul'));
+select toStartOfTenMinutes(toDateTime(0, 'Asia/Istanbul'));
+select toStartOfFifteenMinutes(toDateTime(0, 'Asia/Istanbul'));
+select toStartOfHour(toDateTime(0, 'Asia/Istanbul'));
 select toDateTime(0, 'America/Los_Angeles');
 select toMonday(toDateTime(0, 'America/Los_Angeles'));
 select toStartOfWeek(toDateTime(0, 'America/Los_Angeles'));
diff --git a/tests/queries/0_stateless/02104_overcommit_memory.sh b/tests/queries/0_stateless/02104_overcommit_memory.sh
index f2016dbc0c1..73d65eb40ed 100755
--- a/tests/queries/0_stateless/02104_overcommit_memory.sh
+++ b/tests/queries/0_stateless/02104_overcommit_memory.sh
@@ -5,19 +5,22 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT -q 'DROP USER IF EXISTS u02104'
 $CLICKHOUSE_CLIENT -q 'CREATE USER IF NOT EXISTS u02104 IDENTIFIED WITH no_password'
 $CLICKHOUSE_CLIENT -q 'GRANT ALL ON *.* TO u02104'
 
 function overcommited()
 {
-    $CLICKHOUSE_CLIENT -u u02104 -q 'SELECT number FROM numbers(130000) GROUP BY number SETTINGS memory_overcommit_ratio_denominator=1,memory_usage_overcommit_max_wait_microseconds=500' 2>&1 \
-        | grep -F -q "MEMORY_LIMIT_EXCEEDED" && echo "OVERCOMMITED WITH USER LIMIT IS KILLED"
+    while true; do
+        $CLICKHOUSE_CLIENT -u u02104 -q 'SELECT number FROM numbers(130000) GROUP BY number SETTINGS memory_overcommit_ratio_denominator=1,memory_usage_overcommit_max_wait_microseconds=500' 2>&1 \
+                | grep -F -q "MEMORY_LIMIT_EXCEEDED" && echo "OVERCOMMITED WITH USER LIMIT IS KILLED"
+    done
 }
 
 function expect_execution()
 {
-    $CLICKHOUSE_CLIENT -u u02104 -q 'SELECT number FROM numbers(130000) GROUP BY number SETTINGS max_memory_usage_for_user=5000000,memory_overcommit_ratio_denominator=2,memory_usage_overcommit_max_wait_microseconds=500' >/dev/null 2>/dev/null
+    while true; do
+        $CLICKHOUSE_CLIENT -u u02104 -q 'SELECT number FROM numbers(130000) GROUP BY number SETTINGS max_memory_usage_for_user=5000000,memory_overcommit_ratio_denominator=2,memory_usage_overcommit_max_wait_microseconds=500' >/dev/null 2>/dev/null
+    done
 }
 
 export -f overcommited
@@ -27,9 +30,9 @@ function user_test()
 {
     for _ in {1..10};
     do
-        clickhouse_client_loop_timeout 10 overcommited &
-        clickhouse_client_loop_timeout 10 expect_execution &
-    done
+        timeout 10 bash -c overcommited &
+        timeout 10 bash -c expect_execution &
+    done;
 
     wait
 }
diff --git a/tests/queries/0_stateless/02112_with_fill_interval.reference b/tests/queries/0_stateless/02112_with_fill_interval.reference
index fc6f9378bfa..4bb99803eb1 100644
--- a/tests/queries/0_stateless/02112_with_fill_interval.reference
+++ b/tests/queries/0_stateless/02112_with_fill_interval.reference
@@ -107,3 +107,6 @@
 2020-05-01	2	0
 2020-05-01	3	0
 2020-05-01	4	0
+1970-01-04
+1970-01-03
+1970-01-02
diff --git a/tests/queries/0_stateless/02112_with_fill_interval.sql b/tests/queries/0_stateless/02112_with_fill_interval.sql
index f26ec7da8c9..d2416f9a84b 100644
--- a/tests/queries/0_stateless/02112_with_fill_interval.sql
+++ b/tests/queries/0_stateless/02112_with_fill_interval.sql
@@ -79,3 +79,6 @@ d WITH FILL
 id WITH FILL FROM 1 TO 5;
 
 DROP TABLE with_fill_date;
+
+SELECT d FROM (SELECT toDate(1) AS d)
+ORDER BY d DESC WITH FILL FROM toDate(3) TO toDate(0) STEP INTERVAL -1 DAY;
diff --git a/tests/queries/0_stateless/02117_show_create_table_system.reference b/tests/queries/0_stateless/02117_show_create_table_system.reference
index d4ada9ba5c8..68883aaece1 100644
--- a/tests/queries/0_stateless/02117_show_create_table_system.reference
+++ b/tests/queries/0_stateless/02117_show_create_table_system.reference
@@ -161,6 +161,7 @@ CREATE TABLE system.dictionaries
     `attribute.names` Array(String),
     `attribute.types` Array(String),
     `bytes_allocated` UInt64,
+    `hierarchical_index_bytes_allocated` UInt64,
     `query_count` UInt64,
     `hit_rate` Float64,
     `found_rate` Float64,
@@ -276,7 +277,7 @@ CREATE TABLE system.grants
 (
     `user_name` Nullable(String),
     `role_name` Nullable(String),
-    `access_type` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SELECT' = 5, 'INSERT' = 6, 'ALTER UPDATE' = 7, 'ALTER DELETE' = 8, 'ALTER ADD COLUMN' = 9, 'ALTER MODIFY COLUMN' = 10, 'ALTER DROP COLUMN' = 11, 'ALTER COMMENT COLUMN' = 12, 'ALTER CLEAR COLUMN' = 13, 'ALTER RENAME COLUMN' = 14, 'ALTER MATERIALIZE COLUMN' = 15, 'ALTER COLUMN' = 16, 'ALTER MODIFY COMMENT' = 17, 'ALTER ORDER BY' = 18, 'ALTER SAMPLE BY' = 19, 'ALTER ADD INDEX' = 20, 'ALTER DROP INDEX' = 21, 'ALTER MATERIALIZE INDEX' = 22, 'ALTER CLEAR INDEX' = 23, 'ALTER INDEX' = 24, 'ALTER ADD PROJECTION' = 25, 'ALTER DROP PROJECTION' = 26, 'ALTER MATERIALIZE PROJECTION' = 27, 'ALTER CLEAR PROJECTION' = 28, 'ALTER PROJECTION' = 29, 'ALTER ADD CONSTRAINT' = 30, 'ALTER DROP CONSTRAINT' = 31, 'ALTER CONSTRAINT' = 32, 'ALTER TTL' = 33, 'ALTER MATERIALIZE TTL' = 34, 'ALTER SETTINGS' = 35, 'ALTER MOVE PARTITION' = 36, 'ALTER FETCH PARTITION' = 37, 'ALTER FREEZE PARTITION' = 38, 'ALTER DATABASE SETTINGS' = 39, 'ALTER TABLE' = 40, 'ALTER DATABASE' = 41, 'ALTER VIEW REFRESH' = 42, 'ALTER VIEW MODIFY QUERY' = 43, 'ALTER VIEW' = 44, 'ALTER' = 45, 'CREATE DATABASE' = 46, 'CREATE TABLE' = 47, 'CREATE VIEW' = 48, 'CREATE DICTIONARY' = 49, 'CREATE TEMPORARY TABLE' = 50, 'CREATE FUNCTION' = 51, 'CREATE' = 52, 'DROP DATABASE' = 53, 'DROP TABLE' = 54, 'DROP VIEW' = 55, 'DROP DICTIONARY' = 56, 'DROP FUNCTION' = 57, 'DROP' = 58, 'TRUNCATE' = 59, 'OPTIMIZE' = 60, 'KILL QUERY' = 61, 'KILL TRANSACTION' = 62, 'MOVE PARTITION BETWEEN SHARDS' = 63, 'CREATE USER' = 64, 'ALTER USER' = 65, 'DROP USER' = 66, 'CREATE ROLE' = 67, 'ALTER ROLE' = 68, 'DROP ROLE' = 69, 'ROLE ADMIN' = 70, 'CREATE ROW POLICY' = 71, 'ALTER ROW POLICY' = 72, 'DROP ROW POLICY' = 73, 'CREATE QUOTA' = 74, 'ALTER QUOTA' = 75, 'DROP QUOTA' = 76, 'CREATE SETTINGS PROFILE' = 77, 'ALTER SETTINGS PROFILE' = 78, 'DROP SETTINGS PROFILE' = 79, 'SHOW USERS' = 80, 'SHOW ROLES' = 81, 'SHOW ROW POLICIES' = 82, 'SHOW QUOTAS' = 83, 'SHOW SETTINGS PROFILES' = 84, 'SHOW ACCESS' = 85, 'ACCESS MANAGEMENT' = 86, 'SYSTEM SHUTDOWN' = 87, 'SYSTEM DROP DNS CACHE' = 88, 'SYSTEM DROP MARK CACHE' = 89, 'SYSTEM DROP UNCOMPRESSED CACHE' = 90, 'SYSTEM DROP MMAP CACHE' = 91, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 92, 'SYSTEM DROP CACHE' = 93, 'SYSTEM RELOAD CONFIG' = 94, 'SYSTEM RELOAD SYMBOLS' = 95, 'SYSTEM RELOAD DICTIONARY' = 96, 'SYSTEM RELOAD MODEL' = 97, 'SYSTEM RELOAD FUNCTION' = 98, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 99, 'SYSTEM RELOAD' = 100, 'SYSTEM RESTART DISK' = 101, 'SYSTEM MERGES' = 102, 'SYSTEM TTL MERGES' = 103, 'SYSTEM FETCHES' = 104, 'SYSTEM MOVES' = 105, 'SYSTEM DISTRIBUTED SENDS' = 106, 'SYSTEM REPLICATED SENDS' = 107, 'SYSTEM SENDS' = 108, 'SYSTEM REPLICATION QUEUES' = 109, 'SYSTEM DROP REPLICA' = 110, 'SYSTEM SYNC REPLICA' = 111, 'SYSTEM RESTART REPLICA' = 112, 'SYSTEM RESTORE REPLICA' = 113, 'SYSTEM SYNC DATABASE REPLICA' = 114, 'SYSTEM FLUSH DISTRIBUTED' = 115, 'SYSTEM FLUSH LOGS' = 116, 'SYSTEM FLUSH' = 117, 'SYSTEM THREAD FUZZER' = 118, 'SYSTEM' = 119, 'dictGet' = 120, 'addressToLine' = 121, 'addressToLineWithInlines' = 122, 'addressToSymbol' = 123, 'demangle' = 124, 'INTROSPECTION' = 125, 'FILE' = 126, 'URL' = 127, 'REMOTE' = 128, 'MONGO' = 129, 'MEILISEARCH' = 130, 'MYSQL' = 131, 'POSTGRES' = 132, 'SQLITE' = 133, 'ODBC' = 134, 'JDBC' = 135, 'HDFS' = 136, 'S3' = 137, 'HIVE' = 138, 'SOURCES' = 139, 'CLUSTER' = 140, 'ALL' = 141, 'NONE' = 142),
+    `access_type` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SELECT' = 5, 'INSERT' = 6, 'ALTER UPDATE' = 7, 'ALTER DELETE' = 8, 'ALTER ADD COLUMN' = 9, 'ALTER MODIFY COLUMN' = 10, 'ALTER DROP COLUMN' = 11, 'ALTER COMMENT COLUMN' = 12, 'ALTER CLEAR COLUMN' = 13, 'ALTER RENAME COLUMN' = 14, 'ALTER MATERIALIZE COLUMN' = 15, 'ALTER COLUMN' = 16, 'ALTER MODIFY COMMENT' = 17, 'ALTER ORDER BY' = 18, 'ALTER SAMPLE BY' = 19, 'ALTER ADD INDEX' = 20, 'ALTER DROP INDEX' = 21, 'ALTER MATERIALIZE INDEX' = 22, 'ALTER CLEAR INDEX' = 23, 'ALTER INDEX' = 24, 'ALTER ADD PROJECTION' = 25, 'ALTER DROP PROJECTION' = 26, 'ALTER MATERIALIZE PROJECTION' = 27, 'ALTER CLEAR PROJECTION' = 28, 'ALTER PROJECTION' = 29, 'ALTER ADD CONSTRAINT' = 30, 'ALTER DROP CONSTRAINT' = 31, 'ALTER CONSTRAINT' = 32, 'ALTER TTL' = 33, 'ALTER MATERIALIZE TTL' = 34, 'ALTER SETTINGS' = 35, 'ALTER MOVE PARTITION' = 36, 'ALTER FETCH PARTITION' = 37, 'ALTER FREEZE PARTITION' = 38, 'ALTER DATABASE SETTINGS' = 39, 'ALTER TABLE' = 40, 'ALTER DATABASE' = 41, 'ALTER VIEW REFRESH' = 42, 'ALTER VIEW MODIFY QUERY' = 43, 'ALTER VIEW' = 44, 'ALTER' = 45, 'CREATE DATABASE' = 46, 'CREATE TABLE' = 47, 'CREATE VIEW' = 48, 'CREATE DICTIONARY' = 49, 'CREATE TEMPORARY TABLE' = 50, 'CREATE FUNCTION' = 51, 'CREATE' = 52, 'DROP DATABASE' = 53, 'DROP TABLE' = 54, 'DROP VIEW' = 55, 'DROP DICTIONARY' = 56, 'DROP FUNCTION' = 57, 'DROP' = 58, 'TRUNCATE' = 59, 'OPTIMIZE' = 60, 'KILL QUERY' = 61, 'KILL TRANSACTION' = 62, 'MOVE PARTITION BETWEEN SHARDS' = 63, 'CREATE USER' = 64, 'ALTER USER' = 65, 'DROP USER' = 66, 'CREATE ROLE' = 67, 'ALTER ROLE' = 68, 'DROP ROLE' = 69, 'ROLE ADMIN' = 70, 'CREATE ROW POLICY' = 71, 'ALTER ROW POLICY' = 72, 'DROP ROW POLICY' = 73, 'CREATE QUOTA' = 74, 'ALTER QUOTA' = 75, 'DROP QUOTA' = 76, 'CREATE SETTINGS PROFILE' = 77, 'ALTER SETTINGS PROFILE' = 78, 'DROP SETTINGS PROFILE' = 79, 'SHOW USERS' = 80, 'SHOW ROLES' = 81, 'SHOW ROW POLICIES' = 82, 'SHOW QUOTAS' = 83, 'SHOW SETTINGS PROFILES' = 84, 'SHOW ACCESS' = 85, 'ACCESS MANAGEMENT' = 86, 'SYSTEM SHUTDOWN' = 87, 'SYSTEM DROP DNS CACHE' = 88, 'SYSTEM DROP MARK CACHE' = 89, 'SYSTEM DROP UNCOMPRESSED CACHE' = 90, 'SYSTEM DROP MMAP CACHE' = 91, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 92, 'SYSTEM DROP CACHE' = 93, 'SYSTEM RELOAD CONFIG' = 94, 'SYSTEM RELOAD SYMBOLS' = 95, 'SYSTEM RELOAD DICTIONARY' = 96, 'SYSTEM RELOAD MODEL' = 97, 'SYSTEM RELOAD FUNCTION' = 98, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 99, 'SYSTEM RELOAD' = 100, 'SYSTEM RESTART DISK' = 101, 'SYSTEM MERGES' = 102, 'SYSTEM TTL MERGES' = 103, 'SYSTEM FETCHES' = 104, 'SYSTEM MOVES' = 105, 'SYSTEM DISTRIBUTED SENDS' = 106, 'SYSTEM REPLICATED SENDS' = 107, 'SYSTEM SENDS' = 108, 'SYSTEM REPLICATION QUEUES' = 109, 'SYSTEM DROP REPLICA' = 110, 'SYSTEM SYNC REPLICA' = 111, 'SYSTEM RESTART REPLICA' = 112, 'SYSTEM RESTORE REPLICA' = 113, 'SYSTEM SYNC DATABASE REPLICA' = 114, 'SYSTEM SYNC TRANSACTION LOG' = 115, 'SYSTEM FLUSH DISTRIBUTED' = 116, 'SYSTEM FLUSH LOGS' = 117, 'SYSTEM FLUSH' = 118, 'SYSTEM THREAD FUZZER' = 119, 'SYSTEM' = 120, 'dictGet' = 121, 'addressToLine' = 122, 'addressToLineWithInlines' = 123, 'addressToSymbol' = 124, 'demangle' = 125, 'INTROSPECTION' = 126, 'FILE' = 127, 'URL' = 128, 'REMOTE' = 129, 'MONGO' = 130, 'MEILISEARCH' = 131, 'MYSQL' = 132, 'POSTGRES' = 133, 'SQLITE' = 134, 'ODBC' = 135, 'JDBC' = 136, 'HDFS' = 137, 'S3' = 138, 'HIVE' = 139, 'SOURCES' = 140, 'CLUSTER' = 141, 'ALL' = 142, 'NONE' = 143),
     `database` Nullable(String),
     `table` Nullable(String),
     `column` Nullable(String),
@@ -550,10 +551,10 @@ ENGINE = SystemPartsColumns()
 COMMENT 'SYSTEM TABLE is built on the fly.'
 CREATE TABLE system.privileges
 (
-    `privilege` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SELECT' = 5, 'INSERT' = 6, 'ALTER UPDATE' = 7, 'ALTER DELETE' = 8, 'ALTER ADD COLUMN' = 9, 'ALTER MODIFY COLUMN' = 10, 'ALTER DROP COLUMN' = 11, 'ALTER COMMENT COLUMN' = 12, 'ALTER CLEAR COLUMN' = 13, 'ALTER RENAME COLUMN' = 14, 'ALTER MATERIALIZE COLUMN' = 15, 'ALTER COLUMN' = 16, 'ALTER MODIFY COMMENT' = 17, 'ALTER ORDER BY' = 18, 'ALTER SAMPLE BY' = 19, 'ALTER ADD INDEX' = 20, 'ALTER DROP INDEX' = 21, 'ALTER MATERIALIZE INDEX' = 22, 'ALTER CLEAR INDEX' = 23, 'ALTER INDEX' = 24, 'ALTER ADD PROJECTION' = 25, 'ALTER DROP PROJECTION' = 26, 'ALTER MATERIALIZE PROJECTION' = 27, 'ALTER CLEAR PROJECTION' = 28, 'ALTER PROJECTION' = 29, 'ALTER ADD CONSTRAINT' = 30, 'ALTER DROP CONSTRAINT' = 31, 'ALTER CONSTRAINT' = 32, 'ALTER TTL' = 33, 'ALTER MATERIALIZE TTL' = 34, 'ALTER SETTINGS' = 35, 'ALTER MOVE PARTITION' = 36, 'ALTER FETCH PARTITION' = 37, 'ALTER FREEZE PARTITION' = 38, 'ALTER DATABASE SETTINGS' = 39, 'ALTER TABLE' = 40, 'ALTER DATABASE' = 41, 'ALTER VIEW REFRESH' = 42, 'ALTER VIEW MODIFY QUERY' = 43, 'ALTER VIEW' = 44, 'ALTER' = 45, 'CREATE DATABASE' = 46, 'CREATE TABLE' = 47, 'CREATE VIEW' = 48, 'CREATE DICTIONARY' = 49, 'CREATE TEMPORARY TABLE' = 50, 'CREATE FUNCTION' = 51, 'CREATE' = 52, 'DROP DATABASE' = 53, 'DROP TABLE' = 54, 'DROP VIEW' = 55, 'DROP DICTIONARY' = 56, 'DROP FUNCTION' = 57, 'DROP' = 58, 'TRUNCATE' = 59, 'OPTIMIZE' = 60, 'KILL QUERY' = 61, 'KILL TRANSACTION' = 62, 'MOVE PARTITION BETWEEN SHARDS' = 63, 'CREATE USER' = 64, 'ALTER USER' = 65, 'DROP USER' = 66, 'CREATE ROLE' = 67, 'ALTER ROLE' = 68, 'DROP ROLE' = 69, 'ROLE ADMIN' = 70, 'CREATE ROW POLICY' = 71, 'ALTER ROW POLICY' = 72, 'DROP ROW POLICY' = 73, 'CREATE QUOTA' = 74, 'ALTER QUOTA' = 75, 'DROP QUOTA' = 76, 'CREATE SETTINGS PROFILE' = 77, 'ALTER SETTINGS PROFILE' = 78, 'DROP SETTINGS PROFILE' = 79, 'SHOW USERS' = 80, 'SHOW ROLES' = 81, 'SHOW ROW POLICIES' = 82, 'SHOW QUOTAS' = 83, 'SHOW SETTINGS PROFILES' = 84, 'SHOW ACCESS' = 85, 'ACCESS MANAGEMENT' = 86, 'SYSTEM SHUTDOWN' = 87, 'SYSTEM DROP DNS CACHE' = 88, 'SYSTEM DROP MARK CACHE' = 89, 'SYSTEM DROP UNCOMPRESSED CACHE' = 90, 'SYSTEM DROP MMAP CACHE' = 91, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 92, 'SYSTEM DROP CACHE' = 93, 'SYSTEM RELOAD CONFIG' = 94, 'SYSTEM RELOAD SYMBOLS' = 95, 'SYSTEM RELOAD DICTIONARY' = 96, 'SYSTEM RELOAD MODEL' = 97, 'SYSTEM RELOAD FUNCTION' = 98, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 99, 'SYSTEM RELOAD' = 100, 'SYSTEM RESTART DISK' = 101, 'SYSTEM MERGES' = 102, 'SYSTEM TTL MERGES' = 103, 'SYSTEM FETCHES' = 104, 'SYSTEM MOVES' = 105, 'SYSTEM DISTRIBUTED SENDS' = 106, 'SYSTEM REPLICATED SENDS' = 107, 'SYSTEM SENDS' = 108, 'SYSTEM REPLICATION QUEUES' = 109, 'SYSTEM DROP REPLICA' = 110, 'SYSTEM SYNC REPLICA' = 111, 'SYSTEM RESTART REPLICA' = 112, 'SYSTEM RESTORE REPLICA' = 113, 'SYSTEM SYNC DATABASE REPLICA' = 114, 'SYSTEM FLUSH DISTRIBUTED' = 115, 'SYSTEM FLUSH LOGS' = 116, 'SYSTEM FLUSH' = 117, 'SYSTEM THREAD FUZZER' = 118, 'SYSTEM' = 119, 'dictGet' = 120, 'addressToLine' = 121, 'addressToLineWithInlines' = 122, 'addressToSymbol' = 123, 'demangle' = 124, 'INTROSPECTION' = 125, 'FILE' = 126, 'URL' = 127, 'REMOTE' = 128, 'MONGO' = 129, 'MEILISEARCH' = 130, 'MYSQL' = 131, 'POSTGRES' = 132, 'SQLITE' = 133, 'ODBC' = 134, 'JDBC' = 135, 'HDFS' = 136, 'S3' = 137, 'HIVE' = 138, 'SOURCES' = 139, 'CLUSTER' = 140, 'ALL' = 141, 'NONE' = 142),
+    `privilege` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SELECT' = 5, 'INSERT' = 6, 'ALTER UPDATE' = 7, 'ALTER DELETE' = 8, 'ALTER ADD COLUMN' = 9, 'ALTER MODIFY COLUMN' = 10, 'ALTER DROP COLUMN' = 11, 'ALTER COMMENT COLUMN' = 12, 'ALTER CLEAR COLUMN' = 13, 'ALTER RENAME COLUMN' = 14, 'ALTER MATERIALIZE COLUMN' = 15, 'ALTER COLUMN' = 16, 'ALTER MODIFY COMMENT' = 17, 'ALTER ORDER BY' = 18, 'ALTER SAMPLE BY' = 19, 'ALTER ADD INDEX' = 20, 'ALTER DROP INDEX' = 21, 'ALTER MATERIALIZE INDEX' = 22, 'ALTER CLEAR INDEX' = 23, 'ALTER INDEX' = 24, 'ALTER ADD PROJECTION' = 25, 'ALTER DROP PROJECTION' = 26, 'ALTER MATERIALIZE PROJECTION' = 27, 'ALTER CLEAR PROJECTION' = 28, 'ALTER PROJECTION' = 29, 'ALTER ADD CONSTRAINT' = 30, 'ALTER DROP CONSTRAINT' = 31, 'ALTER CONSTRAINT' = 32, 'ALTER TTL' = 33, 'ALTER MATERIALIZE TTL' = 34, 'ALTER SETTINGS' = 35, 'ALTER MOVE PARTITION' = 36, 'ALTER FETCH PARTITION' = 37, 'ALTER FREEZE PARTITION' = 38, 'ALTER DATABASE SETTINGS' = 39, 'ALTER TABLE' = 40, 'ALTER DATABASE' = 41, 'ALTER VIEW REFRESH' = 42, 'ALTER VIEW MODIFY QUERY' = 43, 'ALTER VIEW' = 44, 'ALTER' = 45, 'CREATE DATABASE' = 46, 'CREATE TABLE' = 47, 'CREATE VIEW' = 48, 'CREATE DICTIONARY' = 49, 'CREATE TEMPORARY TABLE' = 50, 'CREATE FUNCTION' = 51, 'CREATE' = 52, 'DROP DATABASE' = 53, 'DROP TABLE' = 54, 'DROP VIEW' = 55, 'DROP DICTIONARY' = 56, 'DROP FUNCTION' = 57, 'DROP' = 58, 'TRUNCATE' = 59, 'OPTIMIZE' = 60, 'KILL QUERY' = 61, 'KILL TRANSACTION' = 62, 'MOVE PARTITION BETWEEN SHARDS' = 63, 'CREATE USER' = 64, 'ALTER USER' = 65, 'DROP USER' = 66, 'CREATE ROLE' = 67, 'ALTER ROLE' = 68, 'DROP ROLE' = 69, 'ROLE ADMIN' = 70, 'CREATE ROW POLICY' = 71, 'ALTER ROW POLICY' = 72, 'DROP ROW POLICY' = 73, 'CREATE QUOTA' = 74, 'ALTER QUOTA' = 75, 'DROP QUOTA' = 76, 'CREATE SETTINGS PROFILE' = 77, 'ALTER SETTINGS PROFILE' = 78, 'DROP SETTINGS PROFILE' = 79, 'SHOW USERS' = 80, 'SHOW ROLES' = 81, 'SHOW ROW POLICIES' = 82, 'SHOW QUOTAS' = 83, 'SHOW SETTINGS PROFILES' = 84, 'SHOW ACCESS' = 85, 'ACCESS MANAGEMENT' = 86, 'SYSTEM SHUTDOWN' = 87, 'SYSTEM DROP DNS CACHE' = 88, 'SYSTEM DROP MARK CACHE' = 89, 'SYSTEM DROP UNCOMPRESSED CACHE' = 90, 'SYSTEM DROP MMAP CACHE' = 91, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 92, 'SYSTEM DROP CACHE' = 93, 'SYSTEM RELOAD CONFIG' = 94, 'SYSTEM RELOAD SYMBOLS' = 95, 'SYSTEM RELOAD DICTIONARY' = 96, 'SYSTEM RELOAD MODEL' = 97, 'SYSTEM RELOAD FUNCTION' = 98, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 99, 'SYSTEM RELOAD' = 100, 'SYSTEM RESTART DISK' = 101, 'SYSTEM MERGES' = 102, 'SYSTEM TTL MERGES' = 103, 'SYSTEM FETCHES' = 104, 'SYSTEM MOVES' = 105, 'SYSTEM DISTRIBUTED SENDS' = 106, 'SYSTEM REPLICATED SENDS' = 107, 'SYSTEM SENDS' = 108, 'SYSTEM REPLICATION QUEUES' = 109, 'SYSTEM DROP REPLICA' = 110, 'SYSTEM SYNC REPLICA' = 111, 'SYSTEM RESTART REPLICA' = 112, 'SYSTEM RESTORE REPLICA' = 113, 'SYSTEM SYNC DATABASE REPLICA' = 114, 'SYSTEM SYNC TRANSACTION LOG' = 115, 'SYSTEM FLUSH DISTRIBUTED' = 116, 'SYSTEM FLUSH LOGS' = 117, 'SYSTEM FLUSH' = 118, 'SYSTEM THREAD FUZZER' = 119, 'SYSTEM' = 120, 'dictGet' = 121, 'addressToLine' = 122, 'addressToLineWithInlines' = 123, 'addressToSymbol' = 124, 'demangle' = 125, 'INTROSPECTION' = 126, 'FILE' = 127, 'URL' = 128, 'REMOTE' = 129, 'MONGO' = 130, 'MEILISEARCH' = 131, 'MYSQL' = 132, 'POSTGRES' = 133, 'SQLITE' = 134, 'ODBC' = 135, 'JDBC' = 136, 'HDFS' = 137, 'S3' = 138, 'HIVE' = 139, 'SOURCES' = 140, 'CLUSTER' = 141, 'ALL' = 142, 'NONE' = 143),
     `aliases` Array(String),
     `level` Nullable(Enum8('GLOBAL' = 0, 'DATABASE' = 1, 'TABLE' = 2, 'DICTIONARY' = 3, 'VIEW' = 4, 'COLUMN' = 5)),
-    `parent_group` Nullable(Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SELECT' = 5, 'INSERT' = 6, 'ALTER UPDATE' = 7, 'ALTER DELETE' = 8, 'ALTER ADD COLUMN' = 9, 'ALTER MODIFY COLUMN' = 10, 'ALTER DROP COLUMN' = 11, 'ALTER COMMENT COLUMN' = 12, 'ALTER CLEAR COLUMN' = 13, 'ALTER RENAME COLUMN' = 14, 'ALTER MATERIALIZE COLUMN' = 15, 'ALTER COLUMN' = 16, 'ALTER MODIFY COMMENT' = 17, 'ALTER ORDER BY' = 18, 'ALTER SAMPLE BY' = 19, 'ALTER ADD INDEX' = 20, 'ALTER DROP INDEX' = 21, 'ALTER MATERIALIZE INDEX' = 22, 'ALTER CLEAR INDEX' = 23, 'ALTER INDEX' = 24, 'ALTER ADD PROJECTION' = 25, 'ALTER DROP PROJECTION' = 26, 'ALTER MATERIALIZE PROJECTION' = 27, 'ALTER CLEAR PROJECTION' = 28, 'ALTER PROJECTION' = 29, 'ALTER ADD CONSTRAINT' = 30, 'ALTER DROP CONSTRAINT' = 31, 'ALTER CONSTRAINT' = 32, 'ALTER TTL' = 33, 'ALTER MATERIALIZE TTL' = 34, 'ALTER SETTINGS' = 35, 'ALTER MOVE PARTITION' = 36, 'ALTER FETCH PARTITION' = 37, 'ALTER FREEZE PARTITION' = 38, 'ALTER DATABASE SETTINGS' = 39, 'ALTER TABLE' = 40, 'ALTER DATABASE' = 41, 'ALTER VIEW REFRESH' = 42, 'ALTER VIEW MODIFY QUERY' = 43, 'ALTER VIEW' = 44, 'ALTER' = 45, 'CREATE DATABASE' = 46, 'CREATE TABLE' = 47, 'CREATE VIEW' = 48, 'CREATE DICTIONARY' = 49, 'CREATE TEMPORARY TABLE' = 50, 'CREATE FUNCTION' = 51, 'CREATE' = 52, 'DROP DATABASE' = 53, 'DROP TABLE' = 54, 'DROP VIEW' = 55, 'DROP DICTIONARY' = 56, 'DROP FUNCTION' = 57, 'DROP' = 58, 'TRUNCATE' = 59, 'OPTIMIZE' = 60, 'KILL QUERY' = 61, 'KILL TRANSACTION' = 62, 'MOVE PARTITION BETWEEN SHARDS' = 63, 'CREATE USER' = 64, 'ALTER USER' = 65, 'DROP USER' = 66, 'CREATE ROLE' = 67, 'ALTER ROLE' = 68, 'DROP ROLE' = 69, 'ROLE ADMIN' = 70, 'CREATE ROW POLICY' = 71, 'ALTER ROW POLICY' = 72, 'DROP ROW POLICY' = 73, 'CREATE QUOTA' = 74, 'ALTER QUOTA' = 75, 'DROP QUOTA' = 76, 'CREATE SETTINGS PROFILE' = 77, 'ALTER SETTINGS PROFILE' = 78, 'DROP SETTINGS PROFILE' = 79, 'SHOW USERS' = 80, 'SHOW ROLES' = 81, 'SHOW ROW POLICIES' = 82, 'SHOW QUOTAS' = 83, 'SHOW SETTINGS PROFILES' = 84, 'SHOW ACCESS' = 85, 'ACCESS MANAGEMENT' = 86, 'SYSTEM SHUTDOWN' = 87, 'SYSTEM DROP DNS CACHE' = 88, 'SYSTEM DROP MARK CACHE' = 89, 'SYSTEM DROP UNCOMPRESSED CACHE' = 90, 'SYSTEM DROP MMAP CACHE' = 91, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 92, 'SYSTEM DROP CACHE' = 93, 'SYSTEM RELOAD CONFIG' = 94, 'SYSTEM RELOAD SYMBOLS' = 95, 'SYSTEM RELOAD DICTIONARY' = 96, 'SYSTEM RELOAD MODEL' = 97, 'SYSTEM RELOAD FUNCTION' = 98, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 99, 'SYSTEM RELOAD' = 100, 'SYSTEM RESTART DISK' = 101, 'SYSTEM MERGES' = 102, 'SYSTEM TTL MERGES' = 103, 'SYSTEM FETCHES' = 104, 'SYSTEM MOVES' = 105, 'SYSTEM DISTRIBUTED SENDS' = 106, 'SYSTEM REPLICATED SENDS' = 107, 'SYSTEM SENDS' = 108, 'SYSTEM REPLICATION QUEUES' = 109, 'SYSTEM DROP REPLICA' = 110, 'SYSTEM SYNC REPLICA' = 111, 'SYSTEM RESTART REPLICA' = 112, 'SYSTEM RESTORE REPLICA' = 113, 'SYSTEM SYNC DATABASE REPLICA' = 114, 'SYSTEM FLUSH DISTRIBUTED' = 115, 'SYSTEM FLUSH LOGS' = 116, 'SYSTEM FLUSH' = 117, 'SYSTEM THREAD FUZZER' = 118, 'SYSTEM' = 119, 'dictGet' = 120, 'addressToLine' = 121, 'addressToLineWithInlines' = 122, 'addressToSymbol' = 123, 'demangle' = 124, 'INTROSPECTION' = 125, 'FILE' = 126, 'URL' = 127, 'REMOTE' = 128, 'MONGO' = 129, 'MEILISEARCH' = 130, 'MYSQL' = 131, 'POSTGRES' = 132, 'SQLITE' = 133, 'ODBC' = 134, 'JDBC' = 135, 'HDFS' = 136, 'S3' = 137, 'HIVE' = 138, 'SOURCES' = 139, 'CLUSTER' = 140, 'ALL' = 141, 'NONE' = 142))
+    `parent_group` Nullable(Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SELECT' = 5, 'INSERT' = 6, 'ALTER UPDATE' = 7, 'ALTER DELETE' = 8, 'ALTER ADD COLUMN' = 9, 'ALTER MODIFY COLUMN' = 10, 'ALTER DROP COLUMN' = 11, 'ALTER COMMENT COLUMN' = 12, 'ALTER CLEAR COLUMN' = 13, 'ALTER RENAME COLUMN' = 14, 'ALTER MATERIALIZE COLUMN' = 15, 'ALTER COLUMN' = 16, 'ALTER MODIFY COMMENT' = 17, 'ALTER ORDER BY' = 18, 'ALTER SAMPLE BY' = 19, 'ALTER ADD INDEX' = 20, 'ALTER DROP INDEX' = 21, 'ALTER MATERIALIZE INDEX' = 22, 'ALTER CLEAR INDEX' = 23, 'ALTER INDEX' = 24, 'ALTER ADD PROJECTION' = 25, 'ALTER DROP PROJECTION' = 26, 'ALTER MATERIALIZE PROJECTION' = 27, 'ALTER CLEAR PROJECTION' = 28, 'ALTER PROJECTION' = 29, 'ALTER ADD CONSTRAINT' = 30, 'ALTER DROP CONSTRAINT' = 31, 'ALTER CONSTRAINT' = 32, 'ALTER TTL' = 33, 'ALTER MATERIALIZE TTL' = 34, 'ALTER SETTINGS' = 35, 'ALTER MOVE PARTITION' = 36, 'ALTER FETCH PARTITION' = 37, 'ALTER FREEZE PARTITION' = 38, 'ALTER DATABASE SETTINGS' = 39, 'ALTER TABLE' = 40, 'ALTER DATABASE' = 41, 'ALTER VIEW REFRESH' = 42, 'ALTER VIEW MODIFY QUERY' = 43, 'ALTER VIEW' = 44, 'ALTER' = 45, 'CREATE DATABASE' = 46, 'CREATE TABLE' = 47, 'CREATE VIEW' = 48, 'CREATE DICTIONARY' = 49, 'CREATE TEMPORARY TABLE' = 50, 'CREATE FUNCTION' = 51, 'CREATE' = 52, 'DROP DATABASE' = 53, 'DROP TABLE' = 54, 'DROP VIEW' = 55, 'DROP DICTIONARY' = 56, 'DROP FUNCTION' = 57, 'DROP' = 58, 'TRUNCATE' = 59, 'OPTIMIZE' = 60, 'KILL QUERY' = 61, 'KILL TRANSACTION' = 62, 'MOVE PARTITION BETWEEN SHARDS' = 63, 'CREATE USER' = 64, 'ALTER USER' = 65, 'DROP USER' = 66, 'CREATE ROLE' = 67, 'ALTER ROLE' = 68, 'DROP ROLE' = 69, 'ROLE ADMIN' = 70, 'CREATE ROW POLICY' = 71, 'ALTER ROW POLICY' = 72, 'DROP ROW POLICY' = 73, 'CREATE QUOTA' = 74, 'ALTER QUOTA' = 75, 'DROP QUOTA' = 76, 'CREATE SETTINGS PROFILE' = 77, 'ALTER SETTINGS PROFILE' = 78, 'DROP SETTINGS PROFILE' = 79, 'SHOW USERS' = 80, 'SHOW ROLES' = 81, 'SHOW ROW POLICIES' = 82, 'SHOW QUOTAS' = 83, 'SHOW SETTINGS PROFILES' = 84, 'SHOW ACCESS' = 85, 'ACCESS MANAGEMENT' = 86, 'SYSTEM SHUTDOWN' = 87, 'SYSTEM DROP DNS CACHE' = 88, 'SYSTEM DROP MARK CACHE' = 89, 'SYSTEM DROP UNCOMPRESSED CACHE' = 90, 'SYSTEM DROP MMAP CACHE' = 91, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 92, 'SYSTEM DROP CACHE' = 93, 'SYSTEM RELOAD CONFIG' = 94, 'SYSTEM RELOAD SYMBOLS' = 95, 'SYSTEM RELOAD DICTIONARY' = 96, 'SYSTEM RELOAD MODEL' = 97, 'SYSTEM RELOAD FUNCTION' = 98, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 99, 'SYSTEM RELOAD' = 100, 'SYSTEM RESTART DISK' = 101, 'SYSTEM MERGES' = 102, 'SYSTEM TTL MERGES' = 103, 'SYSTEM FETCHES' = 104, 'SYSTEM MOVES' = 105, 'SYSTEM DISTRIBUTED SENDS' = 106, 'SYSTEM REPLICATED SENDS' = 107, 'SYSTEM SENDS' = 108, 'SYSTEM REPLICATION QUEUES' = 109, 'SYSTEM DROP REPLICA' = 110, 'SYSTEM SYNC REPLICA' = 111, 'SYSTEM RESTART REPLICA' = 112, 'SYSTEM RESTORE REPLICA' = 113, 'SYSTEM SYNC DATABASE REPLICA' = 114, 'SYSTEM SYNC TRANSACTION LOG' = 115, 'SYSTEM FLUSH DISTRIBUTED' = 116, 'SYSTEM FLUSH LOGS' = 117, 'SYSTEM FLUSH' = 118, 'SYSTEM THREAD FUZZER' = 119, 'SYSTEM' = 120, 'dictGet' = 121, 'addressToLine' = 122, 'addressToLineWithInlines' = 123, 'addressToSymbol' = 124, 'demangle' = 125, 'INTROSPECTION' = 126, 'FILE' = 127, 'URL' = 128, 'REMOTE' = 129, 'MONGO' = 130, 'MEILISEARCH' = 131, 'MYSQL' = 132, 'POSTGRES' = 133, 'SQLITE' = 134, 'ODBC' = 135, 'JDBC' = 136, 'HDFS' = 137, 'S3' = 138, 'HIVE' = 139, 'SOURCES' = 140, 'CLUSTER' = 141, 'ALL' = 142, 'NONE' = 143))
 )
 ENGINE = SystemPrivileges()
 COMMENT 'SYSTEM TABLE is built on the fly.'
diff --git a/tests/queries/0_stateless/02122_4letter_words_stress_zookeeper.sh b/tests/queries/0_stateless/02122_4letter_words_stress_zookeeper.sh
index 84a1befe421..2deaf788ecf 100755
--- a/tests/queries/0_stateless/02122_4letter_words_stress_zookeeper.sh
+++ b/tests/queries/0_stateless/02122_4letter_words_stress_zookeeper.sh
@@ -17,26 +17,28 @@ function four_letter_thread()
 
 function create_drop_thread()
 {
-    num=$(($RANDOM % 10 + 1))
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE test_table$num (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_table$num', '0') ORDER BY key"
-    sleep 0.$RANDOM
-    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_table$num"
+    while true; do
+        num=$(($RANDOM % 10 + 1))
+        $CLICKHOUSE_CLIENT --query "CREATE TABLE test_table$num (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_table$num', '0') ORDER BY key"
+        sleep 0.$RANDOM
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_table$num"
+    done
 }
 
-export -f four_letter_thread
-export -f create_drop_thread
+export -f four_letter_thread;
+export -f create_drop_thread;
 
 TIMEOUT=15
 
-timeout $TIMEOUT four_letter_thread 2> /dev/null &
-timeout $TIMEOUT four_letter_thread 2> /dev/null &
-timeout $TIMEOUT four_letter_thread 2> /dev/null &
-timeout $TIMEOUT four_letter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c four_letter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c four_letter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c four_letter_thread 2> /dev/null &
+timeout $TIMEOUT bash -c four_letter_thread 2> /dev/null &
 
-clickhouse_client_loop_timeout $TIMEOUT create_drop_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT create_drop_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT create_drop_thread 2> /dev/null &
-clickhouse_client_loop_timeout $TIMEOUT create_drop_thread 2> /dev/null &
+timeout $TIMEOUT bash -c create_drop_thread 2> /dev/null &
+timeout $TIMEOUT bash -c create_drop_thread 2> /dev/null &
+timeout $TIMEOUT bash -c create_drop_thread 2> /dev/null &
+timeout $TIMEOUT bash -c create_drop_thread 2> /dev/null &
 
 
 wait
diff --git a/tests/queries/0_stateless/02124_buffer_with_type_map_long.sh b/tests/queries/0_stateless/02124_buffer_with_type_map_long.sh
index bc43f460289..1b2197ef943 100755
--- a/tests/queries/0_stateless/02124_buffer_with_type_map_long.sh
+++ b/tests/queries/0_stateless/02124_buffer_with_type_map_long.sh
@@ -9,12 +9,16 @@ $CLICKHOUSE_CLIENT -q "CREATE TABLE t_buffer_map(m1 Map(String, UInt64), m2 Map(
 
 function insert1
 {
-    $CLICKHOUSE_CLIENT -q "INSERT INTO t_buffer_map SELECT (range(10), range(10)), (range(10), range(10)) from numbers(100)"
+    while true; do
+        $CLICKHOUSE_CLIENT -q "INSERT INTO t_buffer_map SELECT (range(10), range(10)), (range(10), range(10)) from numbers(100)"
+    done
 }
 
 function select1
 {
-    $CLICKHOUSE_CLIENT -q "SELECT * FROM t_buffer_map" 2> /dev/null > /dev/null
+    while true; do
+        $CLICKHOUSE_CLIENT -q "SELECT * FROM t_buffer_map" 2> /dev/null > /dev/null
+    done
 }
 
 TIMEOUT=10
@@ -22,8 +26,8 @@ TIMEOUT=10
 export -f insert1
 export -f select1
 
-clickhouse_client_loop_timeout $TIMEOUT insert1 &
-clickhouse_client_loop_timeout $TIMEOUT select1 &
+timeout $TIMEOUT bash -c insert1 &
+timeout $TIMEOUT bash -c select1 &
 
 wait
 
diff --git a/tests/queries/0_stateless/02151_http_s_structure_set_eof.sh b/tests/queries/0_stateless/02151_http_s_structure_set_eof.sh
index c3dfc4d03a8..448fa9bfede 100755
--- a/tests/queries/0_stateless/02151_http_s_structure_set_eof.sh
+++ b/tests/queries/0_stateless/02151_http_s_structure_set_eof.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -26,9 +25,3 @@ timeout 0.15s ${CLICKHOUSE_CURL} -sS -F "s=@$tmp_file;" "${CLICKHOUSE_URL}&s_str
 echo $?
 timeout 0.15s ${CLICKHOUSE_CURL} -sS -F "s=@$tmp_file;" "${CLICKHOUSE_URL}&s_structure=key+Int&query=SELECT+dummy+IN+s&input_format_parallel_parsing=false" -o /dev/null
 echo $?
-
-# wait until the query above will start,
-# so that clickhouse_test_wait_queries will see them.
-sleep 5
-
-clickhouse_test_wait_queries 60
diff --git a/tests/queries/0_stateless/02176_toStartOfWeek_overflow_pruning.sql b/tests/queries/0_stateless/02176_toStartOfWeek_overflow_pruning.sql
index 7f62e187241..df5499df32a 100644
--- a/tests/queries/0_stateless/02176_toStartOfWeek_overflow_pruning.sql
+++ b/tests/queries/0_stateless/02176_toStartOfWeek_overflow_pruning.sql
@@ -1,5 +1,5 @@
 SELECT toStartOfWeek(toDateTime('1970-01-01 00:00:00', 'UTC'));
-SELECT toStartOfWeek(toDateTime('1970-01-01 00:00:00', 'Europe/Moscow'));
+SELECT toStartOfWeek(toDateTime('1970-01-01 00:00:00', 'Asia/Istanbul'));
 SELECT toStartOfWeek(toDateTime('1970-01-01 00:00:00', 'Canada/Atlantic'));
 SELECT toStartOfWeek(toDateTime('1970-01-04 00:00:00'));
  
diff --git a/tests/queries/0_stateless/02184_default_table_engine.reference b/tests/queries/0_stateless/02184_default_table_engine.reference
index bc217f3b23a..870dff90efa 100644
--- a/tests/queries/0_stateless/02184_default_table_engine.reference
+++ b/tests/queries/0_stateless/02184_default_table_engine.reference
@@ -10,8 +10,8 @@ CREATE TABLE default.numbers2\n(\n    `number` UInt64\n)\nENGINE = MergeTree\nOR
 45
 CREATE TABLE default.numbers3\n(\n    `number` UInt64\n)\nENGINE = Log
 CREATE MATERIALIZED VIEW default.test_view_filtered\n(\n    `EventDate` Date,\n    `CounterID` UInt32\n)\nENGINE = Memory AS\nSELECT\n    CounterID,\n    EventDate\nFROM default.test_table\nWHERE EventDate < \'2013-01-01\'
-2014-01-02	0	0	1970-01-01 03:00:00	2014-01-02 03:04:06
-1	2014-01-02 07:04:06
+2014-01-02	0	0	1969-12-31 16:00:00	2014-01-02 03:04:06
+1	2014-01-01 19:04:06
 CREATE TABLE default.t1\n(\n    `Rows` UInt64,\n    `MaxHitTime` DateTime(\'UTC\')\n)\nENGINE = MergeTree\nORDER BY Rows\nSETTINGS index_granularity = 8192
 CREATE TABLE default.t2\n(\n    `Rows` UInt64,\n    `MaxHitTime` DateTime(\'UTC\')\n)\nENGINE = Memory
 CREATE TABLE default.mt\n(\n    `a` UInt64,\n    `b` Nullable(String),\n    INDEX b_index b TYPE set(123) GRANULARITY 1\n)\nENGINE = MergeTree\nPRIMARY KEY (a, coalesce(b, \'test\'))\nORDER BY (a, coalesce(b, \'test\'))\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/02184_default_table_engine.sql b/tests/queries/0_stateless/02184_default_table_engine.sql
index 0aac32c9869..4b5ad6c008c 100644
--- a/tests/queries/0_stateless/02184_default_table_engine.sql
+++ b/tests/queries/0_stateless/02184_default_table_engine.sql
@@ -38,9 +38,9 @@ SELECT sum(number) FROM numbers3;
 SHOW CREATE TABLE numbers3;
 DROP TABLE numbers3;
 
-CREATE TABLE test_table (EventDate Date, CounterID UInt32,  UserID UInt64,  EventTime DateTime('Europe/Moscow'), UTCEventTime DateTime('UTC')) PARTITION BY EventDate PRIMARY KEY CounterID;
+CREATE TABLE test_table (EventDate Date, CounterID UInt32,  UserID UInt64,  EventTime DateTime('America/Los_Angeles'), UTCEventTime DateTime('UTC')) PARTITION BY EventDate PRIMARY KEY CounterID;
 SET default_table_engine = 'Memory';
-CREATE MATERIALIZED VIEW test_view (Rows UInt64,  MaxHitTime DateTime('Europe/Moscow')) AS SELECT count() AS Rows, max(UTCEventTime) AS MaxHitTime FROM test_table;
+CREATE MATERIALIZED VIEW test_view (Rows UInt64,  MaxHitTime DateTime('America/Los_Angeles')) AS SELECT count() AS Rows, max(UTCEventTime) AS MaxHitTime FROM test_table;
 CREATE MATERIALIZED VIEW test_view_filtered (EventDate Date, CounterID UInt32) POPULATE AS SELECT CounterID, EventDate FROM test_table WHERE EventDate < '2013-01-01';
 SHOW CREATE TABLE test_view_filtered;
 INSERT INTO test_table (EventDate, UTCEventTime) VALUES ('2014-01-02', '2014-01-02 03:04:06');
diff --git a/tests/queries/0_stateless/02227_union_match_by_name.reference b/tests/queries/0_stateless/02227_union_match_by_name.reference
new file mode 100644
index 00000000000..72c4987a3d2
--- /dev/null
+++ b/tests/queries/0_stateless/02227_union_match_by_name.reference
@@ -0,0 +1,44 @@
+-- { echo }
+EXPLAIN header = 1, optimize = 0 SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
+Expression (Projection)
+Header: avgWeighted(x, y) Nullable(Float64)
+  Expression (Before ORDER BY)
+  Header: avgWeighted(x, y) Nullable(Float64)
+    Aggregating
+    Header: avgWeighted(x, y) Nullable(Float64)
+      Expression (Before GROUP BY)
+      Header: x Nullable(UInt8)
+              y UInt8
+        Union
+        Header: x Nullable(UInt8)
+                y UInt8
+          Expression (Conversion before UNION)
+          Header: x Nullable(UInt8)
+                  y UInt8
+            Expression (Projection)
+            Header: x UInt8
+                    y UInt8
+              Expression (Before ORDER BY)
+              Header: 255 UInt8
+                      1 UInt8
+                      dummy UInt8
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                Header: dummy UInt8
+                  ReadFromStorage (SystemOne)
+                  Header: dummy UInt8
+          Expression (Conversion before UNION)
+          Header: x Nullable(UInt8)
+                  y UInt8
+            Expression (Projection)
+            Header: x Nullable(Nothing)
+                    y UInt8
+              Expression (Before ORDER BY)
+              Header: NULL Nullable(Nothing)
+                      1 UInt8
+                      dummy UInt8
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                Header: dummy UInt8
+                  ReadFromStorage (SystemOne)
+                  Header: dummy UInt8
+SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
+255
diff --git a/tests/queries/0_stateless/02227_union_match_by_name.sql b/tests/queries/0_stateless/02227_union_match_by_name.sql
new file mode 100644
index 00000000000..8ff33b6193d
--- /dev/null
+++ b/tests/queries/0_stateless/02227_union_match_by_name.sql
@@ -0,0 +1,5 @@
+-- Tags: no-backward-compatibility-check:22.5.1.2079
+
+-- { echo }
+EXPLAIN header = 1, optimize = 0 SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
+SELECT avgWeighted(x, y) FROM (SELECT NULL, 255 AS x, 1 AS y UNION ALL SELECT y, NULL AS x, 1 AS y);
diff --git a/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh b/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
index a5c0ee6ecff..bc1a4cbfdd1 100755
--- a/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
+++ b/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
@@ -63,7 +63,7 @@ SELECT indexOf(['a', 'b', NULL], toLowCardinality('a'));
 """
 }
 
-for i in `seq 1 32`; do go | grep -q "Exception" && echo 'FAIL' || echo 'OK' ||: & done
+for _ in `seq 1 32`; do go | grep -q "Exception" && echo 'FAIL' || echo 'OK' ||: & done
 
 wait
 
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference b/tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference
index 8bcb7e1dd42..cfe1ad411cb 100644
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference
+++ b/tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference
@@ -17,3 +17,19 @@ SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesy
 0	745	746
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_3', min_bytes_for_wide_part = 10485760;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	0	1
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	0	1
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql b/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql
index aa469779130..60a8eba8f3e 100644
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql
+++ b/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql
@@ -16,3 +16,18 @@ SELECT * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_3', min_bytes_for_wide_part = 10485760;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
index b2269c16264..3627978dfbc 100644
--- a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
+++ b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
@@ -3,14 +3,43 @@
 SET enable_filesystem_cache_on_write_operations=1;
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
 SYSTEM DROP FILESYSTEM CACHE;
-SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
 0
 SELECT count() FROM system.filesystem_cache;
 0
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
 Row 1:
 ──────
 file_segment_range_begin: 0
@@ -33,7 +62,21 @@ SELECT count() size FROM system.filesystem_cache;
 7
 SYSTEM DROP FILESYSTEM CACHE;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100, 200);
-SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
 Row 1:
 ──────
 file_segment_range_begin: 0
@@ -53,6 +96,7 @@ INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 INSERT INTO test SELECT number, toString(number) FROM numbers(300, 10000);
 SELECT count() FROM system.filesystem_cache;
 21
+SYSTEM START MERGES test;
 OPTIMIZE TABLE test FINAL;
 SELECT count() FROM system.filesystem_cache;
 27
@@ -62,12 +106,17 @@ SELECT count() FROM system.filesystem_cache;
 28
 INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
 SYSTEM FLUSH LOGS;
-SELECT query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
-FROM system.query_log
-WHERE query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
-AND type = 'QueryFinish'
-AND current_database = currentDatabase()
-ORDER BY query_start_time DESC
+SELECT
+    query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
+FROM
+    system.query_log
+WHERE
+    query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
+    AND type = 'QueryFinish'
+    AND current_database = currentDatabase()
+ORDER BY
+    query_start_time
+    DESC
 LIMIT 1;
 SELECT count() FROM test;
 5010500
diff --git a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
index c3ab1de3693..8b3f6a9c0b1 100644
--- a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
+++ b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
@@ -6,16 +6,45 @@ SET enable_filesystem_cache_on_write_operations=1;
 
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
-
+SYSTEM STOP MERGES test;
 SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
 
-SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
 SELECT count() FROM system.filesystem_cache;
 
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 
-SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
 SELECT count() FROM system.filesystem_cache;
 
@@ -33,7 +62,22 @@ SYSTEM DROP FILESYSTEM CACHE;
 
 INSERT INTO test SELECT number, toString(number) FROM numbers(100, 200);
 
-SELECT file_segment_range_begin, file_segment_range_end, size, state FROM (SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path) WHERE endsWith(local_path, 'data.bin') FORMAT Vertical;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+
 SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
 SELECT count() FROM system.filesystem_cache;
 
@@ -44,6 +88,9 @@ SELECT count() FROM system.filesystem_cache;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 INSERT INTO test SELECT number, toString(number) FROM numbers(300, 10000);
 SELECT count() FROM system.filesystem_cache;
+
+SYSTEM START MERGES test;
+
 OPTIMIZE TABLE test FINAL;
 SELECT count() FROM system.filesystem_cache;
 
@@ -53,12 +100,18 @@ SELECT count() FROM system.filesystem_cache;
 
 INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
 SYSTEM FLUSH LOGS;
-SELECT query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
-FROM system.query_log
-WHERE query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
-AND type = 'QueryFinish'
-AND current_database = currentDatabase()
-ORDER BY query_start_time DESC
+SELECT
+    query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
+FROM
+    system.query_log
+WHERE
+    query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
+    AND type = 'QueryFinish'
+    AND current_database = currentDatabase()
+ORDER BY
+    query_start_time
+    DESC
 LIMIT 1;
+
 SELECT count() FROM test;
 SELECT count() FROM test WHERE value LIKE '%010%';
diff --git a/tests/queries/0_stateless/02263_lazy_mark_load.sh b/tests/queries/0_stateless/02263_lazy_mark_load.sh
index bdcada6dc34..b2558b5741c 100755
--- a/tests/queries/0_stateless/02263_lazy_mark_load.sh
+++ b/tests/queries/0_stateless/02263_lazy_mark_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-s3-storage, no-random-settings, no-parallel
 set -eo pipefail
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -26,9 +27,10 @@ ENGINE = MergeTree
 ORDER BY n0 SETTINGS min_bytes_for_wide_part = 0;
 EOF
 
+${CLICKHOUSE_CLIENT} -q "SYSTEM STOP MERGES lazy_mark_test"
 ${CLICKHOUSE_CLIENT} -q "INSERT INTO lazy_mark_test select number, number % 3, number % 5, number % 10, number % 13, number % 15, number % 17, number % 18, number % 22, number % 25 from numbers(1000000)"
 ${CLICKHOUSE_CLIENT} -q "SYSTEM DROP MARK CACHE"
 ${CLICKHOUSE_CLIENT} --log_queries=1 --query_id "${QUERY_ID}" -q "SELECT * FROM lazy_mark_test WHERE n3==11"
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
 
-${CLICKHOUSE_CLIENT} -q "select ProfileEvents['FileOpen'] from system.query_log where query_id = '${QUERY_ID}' and type = 'QueryFinish' and current_database = currentDatabase()"
\ No newline at end of file
+${CLICKHOUSE_CLIENT} -q "select ProfileEvents['FileOpen'] from system.query_log where query_id = '${QUERY_ID}' and type = 'QueryFinish' and current_database = currentDatabase()"
diff --git a/tests/queries/0_stateless/02267_output_format_prometheus.reference b/tests/queries/0_stateless/02267_output_format_prometheus.reference
index 3199a6ead89..e02c6278eb0 100644
--- a/tests/queries/0_stateless/02267_output_format_prometheus.reference
+++ b/tests/queries/0_stateless/02267_output_format_prometheus.reference
@@ -11,8 +11,8 @@ http_request_duration_seconds_count 144320
 
 # HELP http_requests_total Total number of HTTP requests
 # TYPE http_requests_total counter
-http_requests_total{code="200",method="post"} 1027 1395066363000
 http_requests_total{code="400",method="post"} 3 1395066363000
+http_requests_total{code="200",method="post"} 1027 1395066363000
 
 metric_without_timestamp_and_labels 12.47
 
diff --git a/tests/queries/0_stateless/02267_output_format_prometheus.sql b/tests/queries/0_stateless/02267_output_format_prometheus.sql
index 85abeb996ec..c04c2226a1f 100644
--- a/tests/queries/0_stateless/02267_output_format_prometheus.sql
+++ b/tests/queries/0_stateless/02267_output_format_prometheus.sql
@@ -152,7 +152,7 @@ SELECT
     1.7560473e+07 AS value,
     0 :: Float64 AS timestamp
 
-) ORDER BY name
+) ORDER BY name, value
 FORMAT Prometheus;
 
 SELECT
diff --git a/tests/queries/0_stateless/02282_array_distance.reference b/tests/queries/0_stateless/02282_array_distance.reference
index 2fd6c66c817..ebce2788fe9 100644
--- a/tests/queries/0_stateless/02282_array_distance.reference
+++ b/tests/queries/0_stateless/02282_array_distance.reference
@@ -1,21 +1,26 @@
 6
-3.7416575
+3.7416573867739413
+3.2071843327373397
 3
-0.002585097
+0.00258509695694209
 \N
 nan
+0	0	0	0
 12
 14
 21
-7.071068
-9.165152
-12.124355
+7.0710678118654755
+9.16515138991168
+12.12435565298214
+5.917593844525055
+8.308858759453505
+9.932246380845738
 2
 5
 4
-0.16847816
-0.35846698
-0.0741799
+0.16847815937970012
+0.3584669721282153
+0.07417990022744847
 6
 8
 9
@@ -28,12 +33,12 @@ nan
 2	2	1347.4008312302617
 3	1	214.35251339790725
 3	2	1342.8856987845243
-1	1	218.74643
-1	2	1348.2118
-2	1	219.28064
-2	2	1347.4009
-3	1	214.35251
-3	2	1342.8857
+1	1	218.74642854227358
+1	2	1348.2117786164013
+2	1	219.28064210048274
+2	2	1347.4008312302617
+3	1	214.35251339790725
+3	2	1342.8856987845243
 1	1	218.74642854227358
 1	2	1348.2117786164013
 2	1	219.28064210048274
diff --git a/tests/queries/0_stateless/02282_array_distance.sql b/tests/queries/0_stateless/02282_array_distance.sql
index 04de01d7d66..75e4b0d653e 100644
--- a/tests/queries/0_stateless/02282_array_distance.sql
+++ b/tests/queries/0_stateless/02282_array_distance.sql
@@ -1,10 +1,19 @@
-SELECT arrayL1Distance([0, 0, 0], [1, 2, 3]);
-SELECT arrayL2Distance([1, 2, 3], [0, 0, 0]);
-SELECT arrayLinfDistance([1, 2, 3], [0, 0, 0]);
-SELECT arrayCosineDistance([1, 2, 3], [3, 5, 7]);
+SELECT L1Distance([0, 0, 0], [1, 2, 3]);
+SELECT L2Distance([1, 2, 3], [0, 0, 0]);
+SELECT LpDistance([1, 2, 3], [0, 0, 0], 3.5);
+SELECT LinfDistance([1, 2, 3], [0, 0, 0]);
+SELECT cosineDistance([1, 2, 3], [3, 5, 7]);
 
-SELECT arrayL2Distance([1, 2, 3], NULL);
-SELECT arrayCosineDistance([1, 2, 3], [0, 0, 0]);
+SELECT L2Distance([1, 2, 3], NULL);
+SELECT cosineDistance([1, 2, 3], [0, 0, 0]);
+
+-- Overflows
+WITH CAST([-547274980, 1790553898, 1981517754, 1908431500, 1352428565, -573412550, -552499284, 2096941042], 'Array(Int32)') AS a
+SELECT
+    L1Distance(a,a),
+    L2Distance(a,a),
+    LinfDistance(a,a),
+    cosineDistance(a, a);
 
 DROP TABLE IF EXISTS vec1;
 DROP TABLE IF EXISTS vec2;
@@ -16,24 +25,29 @@ CREATE TABLE vec2f (id UInt64, v Array(Float32)) ENGINE = Memory;
 CREATE TABLE vec2d (id UInt64, v Array(Float64)) ENGINE = Memory;
 
 INSERT INTO vec1 VALUES (1, [3, 4, 5]), (2, [2, 4, 8]), (3, [7, 7, 7]);
-SELECT arrayL1Distance(v, [0, 0, 0]) FROM vec1;
-SELECT arrayL2Distance(v, [0, 0, 0]) FROM vec1;
-SELECT arrayLinfDistance([5, 4, 3], v) FROM vec1;
-SELECT arrayCosineDistance([3, 2, 1], v) FROM vec1;
-SELECT arrayLinfDistance(v, materialize([0, -2, 0])) FROM vec1;
-SELECT arrayCosineDistance(v, materialize([1., 1., 1.])) FROM vec1;
+SELECT L1Distance(v, [0, 0, 0]) FROM vec1;
+SELECT L2Distance(v, [0, 0, 0]) FROM vec1;
+SELECT LpDistance(v, [0, 0, 0], 3.14) FROM vec1;
+SELECT LinfDistance([5, 4, 3], v) FROM vec1;
+SELECT cosineDistance([3, 2, 1], v) FROM vec1;
+SELECT LinfDistance(v, materialize([0, -2, 0])) FROM vec1;
+SELECT cosineDistance(v, materialize([1., 1., 1.])) FROM vec1;
 
 INSERT INTO vec2 VALUES (1, [100, 200, 0]), (2, [888, 777, 666]);
-SELECT v1.id, v2.id, arrayL2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2 v2;
+SELECT v1.id, v2.id, L2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2 v2;
 
 INSERT INTO vec2f VALUES (1, [100, 200, 0]), (2, [888, 777, 666]);
-SELECT v1.id, v2.id, arrayL2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2f v2;
+SELECT v1.id, v2.id, L2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2f v2;
 
 INSERT INTO vec2d VALUES (1, [100, 200, 0]), (2, [888, 777, 666]);
-SELECT v1.id, v2.id, arrayL2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2d v2;
+SELECT v1.id, v2.id, L2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2d v2;
 
-SELECT arrayL1Distance([0, 0], [1]); -- { serverError 190 }
-SELECT arrayL2Distance((1, 2), (3,4)); -- { serverError 43 }
+SELECT L1Distance([0, 0], [1]); -- { serverError 190 }
+SELECT L2Distance([1, 2], (3,4)); -- { serverError 43 }
+SELECT LpDistance([1, 2], [3,4]); -- { serverError 42 }
+SELECT LpDistance([1, 2], [3,4], -1.); -- { serverError 69 }
+SELECT LpDistance([1, 2], [3,4], 'aaa'); -- { serverError 43 }
+SELECT LpDistance([1, 2], [3,4], materialize(2.7)); -- { serverError 44 }
 
 DROP TABLE vec1;
 DROP TABLE vec2;
diff --git a/tests/queries/0_stateless/02283_array_norm.reference b/tests/queries/0_stateless/02283_array_norm.reference
index 6dd6b79e6d9..ebaadee321f 100644
--- a/tests/queries/0_stateless/02283_array_norm.reference
+++ b/tests/queries/0_stateless/02283_array_norm.reference
@@ -1,26 +1,28 @@
 6
 7.0710678118654755
+10.882246697870885
 2
-1	5
-2	2
-3	5.196152
-4	0
+10803059573	4234902446.7343364	10803059573	4234902446.7343364	3122003357.3280888	2096941042
+1	7	5	4.601724723020627	4
+2	2	2	2	2
+3	9	5.196152422706632	4.506432087111623	3
+4	0	0	0	0
 1	11
 2	11
 3	11
 4	11
-1	5
-2	2
-3	5.196152
-4	0
+1	7	5	4.601724723020627	4
+2	2	2	2	2
+3	9	5.196152422706632	4.506432087111623	3
+4	0	0	0	0
 1	11
 2	11
 3	11
 4	11
-1	5
-2	2
-3	5.196152422706632
-4	0
+1	7	5	4.601724723020627	4
+2	2	2	2	2
+3	9	5.196152422706632	4.506432087111623	3
+4	0	0	0	0
 1	11
 2	11
 3	11
diff --git a/tests/queries/0_stateless/02283_array_norm.sql b/tests/queries/0_stateless/02283_array_norm.sql
index e11caea7cc1..6938618d633 100644
--- a/tests/queries/0_stateless/02283_array_norm.sql
+++ b/tests/queries/0_stateless/02283_array_norm.sql
@@ -1,6 +1,17 @@
-SELECT arrayL1Norm([1, 2, 3]);
-SELECT arrayL2Norm([3., 4., 5.]);
-SELECT arrayLinfNorm([0, 0, 2]);
+SELECT L1Norm([1, 2, 3]);
+SELECT L2Norm([3., 4., 5.]);
+SELECT LpNorm([3., 4., 5.], 1.1);
+SELECT LinfNorm([0, 0, 2]);
+
+-- Overflows
+WITH CAST([-547274980, 1790553898, 1981517754, 1908431500, 1352428565, -573412550, -552499284, 2096941042], 'Array(Int32)') AS a
+SELECT
+    L1Norm(a),
+    L2Norm(a),
+    LpNorm(a,1),
+    LpNorm(a,2),
+    LpNorm(a,3.14),
+    LinfNorm(a);
 
 DROP TABLE IF EXISTS vec1;
 DROP TABLE IF EXISTS vec1f;
@@ -12,16 +23,22 @@ INSERT INTO vec1 VALUES (1, [3, 4]), (2, [2]), (3, [3, 3, 3]), (4, NULL);
 INSERT INTO vec1f VALUES (1, [3, 4]), (2, [2]), (3, [3, 3, 3]), (4, NULL);
 INSERT INTO vec1d VALUES (1, [3, 4]), (2, [2]), (3, [3, 3, 3]), (4, NULL);
 
-SELECT id, arrayL2Norm(v) FROM vec1;
-SELECT id, arrayL1Norm(materialize([5., 6.])) FROM vec1;
+SELECT id, L1Norm(v), L2Norm(v), LpNorm(v, 2.7), LinfNorm(v) FROM vec1;
+SELECT id, L1Norm(materialize([5., 6.])) FROM vec1;
 
-SELECT id, arrayL2Norm(v) FROM vec1f;
-SELECT id, arrayL1Norm(materialize([5., 6.])) FROM vec1f;
+SELECT id, L1Norm(v), L2Norm(v), LpNorm(v, 2.7), LinfNorm(v) FROM vec1f;
+SELECT id, L1Norm(materialize([5., 6.])) FROM vec1f;
 
-SELECT id, arrayL2Norm(v) FROM vec1d;
-SELECT id, arrayL1Norm(materialize([5., 6.])) FROM vec1d;
+SELECT id, L1Norm(v), L2Norm(v), LpNorm(v, 2.7), LinfNorm(v) FROM vec1d;
+SELECT id, L1Norm(materialize([5., 6.])) FROM vec1d;
 
-SELECT arrayL1Norm((1, 2,)); -- { serverError 43 }
+SELECT L1Norm(1, 2); -- { serverError 42 }
+
+SELECT LpNorm([1,2]); -- { serverError 42 }
+SELECT LpNorm([1,2], -3.4); -- { serverError 69 }
+SELECT LpNorm([1,2], 'aa'); -- { serverError 43 }
+SELECT LpNorm([1,2], [1]); -- { serverError 43 }
+SELECT LpNorm([1,2], materialize(3.14)); -- { serverError 44 }
 
 DROP TABLE vec1;
 DROP TABLE vec1f;
diff --git a/tests/queries/0_stateless/02292_h3_unidirectional_funcs.reference b/tests/queries/0_stateless/02292_h3_unidirectional_funcs.reference
new file mode 100644
index 00000000000..219d9888943
--- /dev/null
+++ b/tests/queries/0_stateless/02292_h3_unidirectional_funcs.reference
@@ -0,0 +1,21 @@
+599686043507097597
+0
+0
+(599686042433355775,599686043507097599)
+(0,0)
+(0,0)
+599686042433355775
+599686042433355773
+0
+0
+[(37.42012867767779,-122.03773496427027),(37.33755608435299,-122.090428929044)]
+[]
+[]
+[1248204388774707199,1320261982812635135,1392319576850563071,1464377170888491007,1536434764926418943,1608492358964346879]
+[1248204388774707197,1320261982812635133,1392319576850563069,1464377170888491005,1536434764926418941,1608492358964346877]
+[1262459476296859647,1334517070334787583,1406574664372715519,1478632258410643455,1550689852448571391,1622747446486499327]
+1248204388774707199
+0
+1
+0
+0
diff --git a/tests/queries/0_stateless/02292_h3_unidirectional_funcs.sql b/tests/queries/0_stateless/02292_h3_unidirectional_funcs.sql
new file mode 100644
index 00000000000..4082671356e
--- /dev/null
+++ b/tests/queries/0_stateless/02292_h3_unidirectional_funcs.sql
@@ -0,0 +1,30 @@
+-- Tags: no-fasttest
+
+SELECT h3GetDestinationIndexFromUnidirectionalEdge(1248204388774707197);
+SELECT h3GetDestinationIndexFromUnidirectionalEdge(599686042433355773);
+SELECT h3GetDestinationIndexFromUnidirectionalEdge(stringToH3('85283473ffffff'));
+
+SELECT h3GetIndexesFromUnidirectionalEdge(1248204388774707199);
+SELECT h3GetIndexesFromUnidirectionalEdge(599686042433355775);
+SELECT h3GetIndexesFromUnidirectionalEdge(stringToH3('85283473ffffff'));
+
+SELECT h3GetOriginIndexFromUnidirectionalEdge(1248204388774707199);
+SELECT h3GetOriginIndexFromUnidirectionalEdge(1248204388774707197);
+SELECT h3GetOriginIndexFromUnidirectionalEdge(599686042433355775);
+SELECT h3GetOriginIndexFromUnidirectionalEdge(stringToH3('85283473ffffff'));
+
+SELECT h3GetUnidirectionalEdgeBoundary(1248204388774707199);
+SELECT h3GetUnidirectionalEdgeBoundary(599686042433355773);
+SELECT h3GetUnidirectionalEdgeBoundary(stringToH3('85283473ffffff'));
+
+SELECT h3GetUnidirectionalEdgesFromHexagon(1248204388774707199);
+SELECT h3GetUnidirectionalEdgesFromHexagon(599686042433355773);
+SELECT h3GetUnidirectionalEdgesFromHexagon(stringToH3('85283473ffffff'));
+
+select h3GetUnidirectionalEdge(stringToH3('85283473fffffff'), stringToH3('85283477fffffff'));
+select h3GetUnidirectionalEdge(stringToH3('85283473fffffff'), stringToH3('85283473fffffff'));
+SELECT h3GetUnidirectionalEdge(stringToH3('85283473ffffff'), stringToH3('852\03477fffffff')); -- { serverError 43 }
+
+SELECT h3UnidirectionalEdgeIsValid(1248204388774707199) as edge;
+SELECT h3UnidirectionalEdgeIsValid(1248204388774707197) as edge;
+SELECT h3UnidirectionalEdgeIsValid(stringToH3('85283473ffffff')) as edge;
diff --git a/tests/queries/0_stateless/02293_grouping_function.reference b/tests/queries/0_stateless/02293_grouping_function.reference
new file mode 100644
index 00000000000..e71d6812ab5
--- /dev/null
+++ b/tests/queries/0_stateless/02293_grouping_function.reference
@@ -0,0 +1,176 @@
+-- { echoOn }
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr;
+0	1
+0	1
+0	2
+1	2
+2	2
+3	2
+4	2
+5	2
+6	2
+7	2
+8	2
+9	2
+SELECT
+    number,
+    grouping(number % 2, number) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr;
+0	1
+0	2
+0	2
+1	1
+2	1
+3	1
+4	1
+5	1
+6	1
+7	1
+8	1
+9	1
+SELECT
+    number,
+    grouping(number, number % 2) = 1 AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr;
+0	0
+0	1
+0	1
+1	0
+2	0
+3	0
+4	0
+5	0
+6	0
+7	0
+8	0
+9	0
+SELECT
+    number
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, grouping(number, number % 2) = 1;
+0
+0
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT
+    number,
+    count(),
+    grouping(number, number % 2) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number, number % 2),
+        ()
+    )
+ORDER BY (gr, number);
+0	10	0
+0	1	2
+1	1	2
+2	1	2
+3	1	2
+4	1	2
+5	1	2
+6	1	2
+7	1	2
+8	1	2
+9	1	2
+0	1	3
+1	1	3
+2	1	3
+3	1	3
+4	1	3
+5	1	3
+6	1	3
+7	1	3
+8	1	3
+9	1	3
+SELECT
+    number
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+HAVING grouping(number, number % 2) = 2
+ORDER BY number
+SETTINGS enable_optimize_predicate_expression = 0;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT
+    number
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+HAVING grouping(number, number % 2) = 1
+ORDER BY number
+SETTINGS enable_optimize_predicate_expression = 0;
+0
+0
+SELECT
+    number,
+    GROUPING(number, number % 2) = 1 as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    GROUPING SETS (
+    (number),
+    (number % 2))
+ORDER BY number, gr;
+0	0
+0	1
+0	1
+1	0
+2	0
+3	0
+4	0
+5	0
+6	0
+7	0
+8	0
+9	0
diff --git a/tests/queries/0_stateless/02293_grouping_function.sql b/tests/queries/0_stateless/02293_grouping_function.sql
new file mode 100644
index 00000000000..169fc09c324
--- /dev/null
+++ b/tests/queries/0_stateless/02293_grouping_function.sql
@@ -0,0 +1,101 @@
+SELECT
+    number,
+    grouping(number, number % 2, number % 3) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr; -- { serverError BAD_ARGUMENTS }
+
+-- { echoOn }
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr;
+
+SELECT
+    number,
+    grouping(number % 2, number) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) = 1 AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, gr;
+
+SELECT
+    number
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+ORDER BY number, grouping(number, number % 2) = 1;
+
+SELECT
+    number,
+    count(),
+    grouping(number, number % 2) AS gr
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number, number % 2),
+        ()
+    )
+ORDER BY (gr, number);
+
+SELECT
+    number
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+HAVING grouping(number, number % 2) = 2
+ORDER BY number
+SETTINGS enable_optimize_predicate_expression = 0;
+
+SELECT
+    number
+FROM numbers(10)
+GROUP BY
+    GROUPING SETS (
+        (number),
+        (number % 2)
+    )
+HAVING grouping(number, number % 2) = 1
+ORDER BY number
+SETTINGS enable_optimize_predicate_expression = 0;
+
+SELECT
+    number,
+    GROUPING(number, number % 2) = 1 as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    GROUPING SETS (
+    (number),
+    (number % 2))
+ORDER BY number, gr;
diff --git a/tests/queries/0_stateless/02293_grouping_function_group_by.reference b/tests/queries/0_stateless/02293_grouping_function_group_by.reference
new file mode 100644
index 00000000000..7f87aecd4bd
--- /dev/null
+++ b/tests/queries/0_stateless/02293_grouping_function_group_by.reference
@@ -0,0 +1,273 @@
+-- { echoOn }
+SELECT
+    number,
+    grouping(number, number % 2) = 3
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+ORDER BY number;
+0	1
+1	1
+2	1
+3	1
+4	1
+5	1
+6	1
+7	1
+8	1
+9	1
+SELECT
+    number,
+    grouping(number),
+    GROUPING(number % 2)
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+ORDER BY number;
+0	1	1
+1	1	1
+2	1	1
+3	1	1
+4	1	1
+5	1	1
+6	1	1
+7	1	1
+8	1	1
+9	1	1
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+    WITH ROLLUP
+ORDER BY
+    number, gr;
+0	0
+0	2
+0	3
+1	2
+1	3
+2	2
+2	3
+3	2
+3	3
+4	2
+4	3
+5	2
+5	3
+6	2
+6	3
+7	2
+7	3
+8	2
+8	3
+9	2
+9	3
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    ROLLUP(number, number % 2)
+ORDER BY
+    number, gr;
+0	0
+0	2
+0	3
+1	2
+1	3
+2	2
+2	3
+3	2
+3	3
+4	2
+4	3
+5	2
+5	3
+6	2
+6	3
+7	2
+7	3
+8	2
+8	3
+9	2
+9	3
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+    WITH CUBE
+ORDER BY
+    number, gr;
+0	0
+0	1
+0	1
+0	2
+0	3
+1	2
+1	3
+2	2
+2	3
+3	2
+3	3
+4	2
+4	3
+5	2
+5	3
+6	2
+6	3
+7	2
+7	3
+8	2
+8	3
+9	2
+9	3
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2)
+ORDER BY
+    number, gr;
+0	0
+0	1
+0	1
+0	2
+0	3
+1	2
+1	3
+2	2
+2	3
+3	2
+3	3
+4	2
+4	3
+5	2
+5	3
+6	2
+6	3
+7	2
+7	3
+8	2
+8	3
+9	2
+9	3
+SELECT
+    number,
+    grouping(number, number % 2) + 3 as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2)
+HAVING grouping(number) != 0
+ORDER BY
+    number, gr;
+0	5
+0	6
+1	5
+1	6
+2	5
+2	6
+3	5
+3	6
+4	5
+4	6
+5	5
+5	6
+6	5
+6	6
+7	5
+7	6
+8	5
+8	6
+9	5
+9	6
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2) WITH TOTALS
+HAVING grouping(number) != 0
+ORDER BY
+    number, gr; -- { serverError NOT_IMPLEMENTED }
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2) WITH TOTALS
+ORDER BY
+    number, gr;
+0	0
+0	1
+0	1
+0	2
+0	3
+1	2
+1	3
+2	2
+2	3
+3	2
+3	3
+4	2
+4	3
+5	2
+5	3
+6	2
+6	3
+7	2
+7	3
+8	2
+8	3
+9	2
+9	3
+
+0	0
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    ROLLUP(number, number % 2) WITH TOTALS
+HAVING grouping(number) != 0
+ORDER BY
+    number, gr; -- { serverError NOT_IMPLEMENTED }
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    ROLLUP(number, number % 2) WITH TOTALS
+ORDER BY
+    number, gr;
+0	0
+0	2
+0	3
+1	2
+1	3
+2	2
+2	3
+3	2
+3	3
+4	2
+4	3
+5	2
+5	3
+6	2
+6	3
+7	2
+7	3
+8	2
+8	3
+9	2
+9	3
+
+0	0
diff --git a/tests/queries/0_stateless/02293_grouping_function_group_by.sql b/tests/queries/0_stateless/02293_grouping_function_group_by.sql
new file mode 100644
index 00000000000..9bf9d43478b
--- /dev/null
+++ b/tests/queries/0_stateless/02293_grouping_function_group_by.sql
@@ -0,0 +1,116 @@
+SELECT
+    number,
+    grouping(number, number % 2, number % 3) = 6
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+ORDER BY number; -- { serverError BAD_ARGUMENTS }
+
+-- { echoOn }
+SELECT
+    number,
+    grouping(number, number % 2) = 3
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+ORDER BY number;
+
+SELECT
+    number,
+    grouping(number),
+    GROUPING(number % 2)
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+ORDER BY number;
+
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+    WITH ROLLUP
+ORDER BY
+    number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    ROLLUP(number, number % 2)
+ORDER BY
+    number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    number,
+    number % 2
+    WITH CUBE
+ORDER BY
+    number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) AS gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2)
+ORDER BY
+    number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) + 3 as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2)
+HAVING grouping(number) != 0
+ORDER BY
+    number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2) WITH TOTALS
+HAVING grouping(number) != 0
+ORDER BY
+    number, gr; -- { serverError NOT_IMPLEMENTED }
+
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    CUBE(number, number % 2) WITH TOTALS
+ORDER BY
+    number, gr;
+
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    ROLLUP(number, number % 2) WITH TOTALS
+HAVING grouping(number) != 0
+ORDER BY
+    number, gr; -- { serverError NOT_IMPLEMENTED }
+
+SELECT
+    number,
+    grouping(number, number % 2) as gr
+FROM remote('127.0.0.{2,3}', numbers(10))
+GROUP BY
+    ROLLUP(number, number % 2) WITH TOTALS
+ORDER BY
+    number, gr;
diff --git a/tests/queries/0_stateless/02294_decimal_second_errors.reference b/tests/queries/0_stateless/02294_decimal_second_errors.reference
new file mode 100644
index 00000000000..a9e2f17562a
--- /dev/null
+++ b/tests/queries/0_stateless/02294_decimal_second_errors.reference
@@ -0,0 +1,6 @@
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02294_decimal_second_errors.sql b/tests/queries/0_stateless/02294_decimal_second_errors.sql
new file mode 100644
index 00000000000..7a073f64d9a
--- /dev/null
+++ b/tests/queries/0_stateless/02294_decimal_second_errors.sql
@@ -0,0 +1,11 @@
+SELECT 1 SETTINGS max_execution_time=NaN; -- { serverError 72 }
+SELECT 1 SETTINGS max_execution_time=Infinity; -- { serverError 72 };
+SELECT 1 SETTINGS max_execution_time=-Infinity; -- { serverError 72 };
+
+-- Ok values
+SELECT 1 SETTINGS max_execution_time=-0.5;
+SELECT 1 SETTINGS max_execution_time=0.5;
+SELECT 1 SETTINGS max_execution_time=-1;
+SELECT 1 SETTINGS max_execution_time=0.0;
+SELECT 1 SETTINGS max_execution_time=-0.0;
+SELECT 1 SETTINGS max_execution_time=10;
diff --git a/tests/queries/0_stateless/02294_dictionaries_hierarchical_index.reference b/tests/queries/0_stateless/02294_dictionaries_hierarchical_index.reference
new file mode 100644
index 00000000000..8f421ba4524
--- /dev/null
+++ b/tests/queries/0_stateless/02294_dictionaries_hierarchical_index.reference
@@ -0,0 +1,6 @@
+1	0
+1
+1	0
+1
+1	0
+0
diff --git a/tests/queries/0_stateless/02294_dictionaries_hierarchical_index.sql b/tests/queries/0_stateless/02294_dictionaries_hierarchical_index.sql
new file mode 100644
index 00000000000..bc2a1020ab8
--- /dev/null
+++ b/tests/queries/0_stateless/02294_dictionaries_hierarchical_index.sql
@@ -0,0 +1,67 @@
+DROP TABLE IF EXISTS test_hierarchy_source_table;
+CREATE TABLE test_hierarchy_source_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE=MergeTree ORDER BY id;
+
+INSERT INTO test_hierarchy_source_table VALUES (1, 0);
+
+DROP DICTIONARY IF EXISTS hierarchy_flat_dictionary_index;
+CREATE DICTIONARY hierarchy_flat_dictionary_index
+(
+    id UInt64,
+    parent_id UInt64 BIDIRECTIONAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'test_hierarchy_source_table'))
+LAYOUT(FLAT())
+LIFETIME(0); -- {serverError 36 }
+
+DROP DICTIONARY IF EXISTS hierarchy_flat_dictionary_index;
+CREATE DICTIONARY hierarchy_flat_dictionary_index
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL BIDIRECTIONAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'test_hierarchy_source_table'))
+LAYOUT(FLAT())
+LIFETIME(0);
+
+SELECT * FROM hierarchy_flat_dictionary_index;
+SELECT hierarchical_index_bytes_allocated > 0 FROM system.dictionaries WHERE name = 'hierarchy_flat_dictionary_index' AND database = currentDatabase();
+
+DROP DICTIONARY hierarchy_flat_dictionary_index;
+
+DROP DICTIONARY IF EXISTS hierarchy_hashed_dictionary_index;
+CREATE DICTIONARY hierarchy_hashed_dictionary_index
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL BIDIRECTIONAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'test_hierarchy_source_table'))
+LAYOUT(FLAT())
+LIFETIME(0);
+
+SELECT * FROM hierarchy_hashed_dictionary_index;
+SELECT hierarchical_index_bytes_allocated > 0 FROM system.dictionaries WHERE name = 'hierarchy_hashed_dictionary_index' AND database = currentDatabase();
+DROP DICTIONARY hierarchy_hashed_dictionary_index;
+
+DROP DICTIONARY IF EXISTS hierarchy_hashed_array_dictionary_index;
+CREATE DICTIONARY hierarchy_hashed_array_dictionary_index
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'test_hierarchy_source_table'))
+LAYOUT(HASHED_ARRAY())
+LIFETIME(0);
+
+SELECT * FROM hierarchy_hashed_array_dictionary_index;
+SELECT hierarchical_index_bytes_allocated > 0 FROM system.dictionaries WHERE name = 'hierarchy_hashed_array_dictionary_index' AND database = currentDatabase();
+
+DROP DICTIONARY hierarchy_hashed_array_dictionary_index;
+DROP TABLE test_hierarchy_source_table;
diff --git a/tests/queries/0_stateless/02294_floating_point_second_in_settings.reference b/tests/queries/0_stateless/02294_floating_point_second_in_settings.reference
new file mode 100644
index 00000000000..c12d45c746a
--- /dev/null
+++ b/tests/queries/0_stateless/02294_floating_point_second_in_settings.reference
@@ -0,0 +1,8 @@
+TCP CLIENT
+maximum: 1.1
+TCP CLIENT WITH SETTINGS IN QUERY
+maximum: 1.1
+HTTP CLIENT
+maximum: 1.1
+TABLE: system.settings
+max_execution_time	30.5	1
diff --git a/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh b/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh
new file mode 100755
index 00000000000..b5bf2deb974
--- /dev/null
+++ b/tests/queries/0_stateless/02294_floating_point_second_in_settings.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e -o pipefail
+
+
+MAX_TIMEOUT=1.1 # Use 1.1 because using 0.x truncates to 0 in older releases
+
+function check_output() {
+  MAXTIME_USED=$(echo "$1" | grep -Eo "maximum: [0-9]+\.[0-9]+" | head -n1 || true)
+  if [ "${MAXTIME_USED}" != "maximum: ${MAX_TIMEOUT}" ];
+  then
+    echo "'$MAXTIME_USED' is not equal to 'maximum: ${MAX_TIMEOUT}'"
+    echo "OUTPUT: $1"
+  else
+    echo "$MAXTIME_USED"
+  fi
+}
+
+# TCP CLIENT
+echo "TCP CLIENT"
+OUTPUT=$($CLICKHOUSE_CLIENT --max_execution_time $MAX_TIMEOUT -q "SELECT count() FROM system.numbers" 2>&1 || true)
+check_output "${OUTPUT}"
+
+echo "TCP CLIENT WITH SETTINGS IN QUERY"
+OUTPUT=$($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.numbers SETTINGS max_execution_time=$MAX_TIMEOUT" 2>&1 || true)
+check_output "${OUTPUT}"
+
+# HTTP CLIENT
+echo "HTTP CLIENT"
+OUTPUT=$(${CLICKHOUSE_CURL_COMMAND} -q -sS "$CLICKHOUSE_URL&max_execution_time=$MAX_TIMEOUT" -d \
+    "SELECT count() FROM system.numbers" || true)
+check_output "${OUTPUT}"
+
+# CHECK system.settings
+echo "TABLE: system.settings"
+echo "SELECT name, value, changed from system.settings where name = 'max_execution_time'" | clickhouse-client --max_execution_time 30.5
diff --git a/tests/queries/0_stateless/02294_nothing_arguments_in_functions.reference b/tests/queries/0_stateless/02294_nothing_arguments_in_functions.reference
new file mode 100644
index 00000000000..665931efb71
--- /dev/null
+++ b/tests/queries/0_stateless/02294_nothing_arguments_in_functions.reference
@@ -0,0 +1,29 @@
+[]
+Array(Nothing)
+[]
+Array(Nothing)
+[]
+Array(Nothing)
+[]
+Array(Nothing)
+Array(String)
+Array(Nothing)
+Array(Nothing)
+Array(Array(Nothing))
+Array(Array(Nothing))
+Array(Map(UInt8, Nothing))
+Array(Map(UInt8, Nothing))
+Array(Tuple(Nothing))
+Array(Tuple(UInt8, Nothing))
+Nothing
+Nothing
+Nothing
+Nothing
+Array(Nothing)
+Array(Nothing)
+Map(UInt8, Nothing)
+Map(UInt8, Nothing)
+Tuple(UInt8, Nothing)
+Tuple(UInt8, Nothing)
+Nothing
+Nothing
diff --git a/tests/queries/0_stateless/02294_nothing_arguments_in_functions.sql b/tests/queries/0_stateless/02294_nothing_arguments_in_functions.sql
new file mode 100644
index 00000000000..4406a05df0c
--- /dev/null
+++ b/tests/queries/0_stateless/02294_nothing_arguments_in_functions.sql
@@ -0,0 +1,40 @@
+select arrayMap(x -> 2 * x, []);
+select toTypeName(arrayMap(x -> 2 * x, []));
+select arrayMap((x, y) -> x + y, [], []);
+select toTypeName(arrayMap((x, y) -> x + y, [], []));
+select arrayMap((x, y) -> x + y, [], CAST([], 'Array(Int32)'));
+select toTypeName(arrayMap((x, y) -> x + y, [], CAST([], 'Array(Int32)')));
+
+select arrayFilter(x -> 2 * x < 0, []);
+select toTypeName(arrayFilter(x -> 2 * x < 0, []));
+
+select toTypeName(arrayMap(x -> CAST(x, 'String'), []));
+select toTypeName(arrayMap(x -> toInt32(x), []));
+select toColumnTypeName(arrayMap(x -> toInt32(x), []));
+
+select toTypeName(arrayMap(x -> [x], []));
+select toColumnTypeName(arrayMap(x -> [x], []));
+
+select toTypeName(arrayMap(x ->map(1, x), []));
+select toColumnTypeName(arrayMap(x -> map(1, x), []));
+
+select toTypeName(arrayMap(x ->tuple(x), []));
+select toColumnTypeName(arrayMap(x -> tuple(1, x), []));
+
+select toTypeName(toInt32(assumeNotNull(materialize(NULL))));
+select toColumnTypeName(toInt32(assumeNotNull(materialize(NULL))));
+
+select toTypeName(assumeNotNull(materialize(NULL)));
+select toColumnTypeName(assumeNotNull(materialize(NULL)));
+
+select toTypeName([assumeNotNull(materialize(NULL))]);
+select toColumnTypeName([assumeNotNull(materialize(NULL))]);
+
+select toTypeName(map(1, assumeNotNull(materialize(NULL))));
+select toColumnTypeName(map(1, assumeNotNull(materialize(NULL))));
+
+select toTypeName(tuple(1, assumeNotNull(materialize(NULL))));
+select toColumnTypeName(tuple(1, assumeNotNull(materialize(NULL))));
+
+select toTypeName(assumeNotNull(materialize(NULL)) * 2);
+select toColumnTypeName(assumeNotNull(materialize(NULL)) * 2);
diff --git a/tests/queries/0_stateless/02294_nothing_arguments_in_functions_errors.reference b/tests/queries/0_stateless/02294_nothing_arguments_in_functions_errors.reference
new file mode 100644
index 00000000000..0eabe367130
--- /dev/null
+++ b/tests/queries/0_stateless/02294_nothing_arguments_in_functions_errors.reference
@@ -0,0 +1,3 @@
+OK
+OK
+OK
diff --git a/tests/queries/0_stateless/02294_nothing_arguments_in_functions_errors.sh b/tests/queries/0_stateless/02294_nothing_arguments_in_functions_errors.sh
new file mode 100755
index 00000000000..931985340c2
--- /dev/null
+++ b/tests/queries/0_stateless/02294_nothing_arguments_in_functions_errors.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "SELECT assumeNotNull(NULL)" 2>&1 | grep -q "ILLEGAL_COLUMN" && echo "OK" || echo "FAIL"
+$CLICKHOUSE_LOCAL -q "SELECT assumeNotNull(materialize(NULL))" 2>&1 | grep -q "ILLEGAL_TYPE_OF_ARGUMENT" && echo "OK" || echo "FAIL"
+$CLICKHOUSE_LOCAL -q "SELECT assumeNotNull(materialize(NULL)) from numbers(10)" 2>&1 | grep -q "ILLEGAL_TYPE_OF_ARGUMENT" && echo "OK" || echo "FAIL"
+
diff --git a/tests/queries/0_stateless/02294_overcommit_overflow.sh b/tests/queries/0_stateless/02294_overcommit_overflow.sh
index 64a4dddc67f..0fe7882cb3d 100755
--- a/tests/queries/0_stateless/02294_overcommit_overflow.sh
+++ b/tests/queries/0_stateless/02294_overcommit_overflow.sh
@@ -11,14 +11,18 @@ $CLICKHOUSE_CLIENT -q 'GRANT ALL ON *.* TO u02294'
 
 function query()
 {
+  while true; do
     $CLICKHOUSE_CLIENT -u u02294 -q 'SELECT number FROM numbers(130000) GROUP BY number SETTINGS max_memory_usage_for_user=5000000,memory_overcommit_ratio_denominator=2000000000000000000,memory_usage_overcommit_max_wait_microseconds=500' >/dev/null 2>/dev/null
+  done
 }
 
 export -f query
 
+TIMEOUT=10
+
 for _ in {1..10};
 do
-    clickhouse_client_loop_timeout 10 query &
+    timeout $TIMEOUT bash -c query &
 done
 
 wait
diff --git a/tests/queries/0_stateless/02296_nullable_arguments_in_array_filter.reference b/tests/queries/0_stateless/02296_nullable_arguments_in_array_filter.reference
new file mode 100644
index 00000000000..8c11de86262
--- /dev/null
+++ b/tests/queries/0_stateless/02296_nullable_arguments_in_array_filter.reference
@@ -0,0 +1,4 @@
+[]
+[]
+[2,4]
+[1,3]
diff --git a/tests/queries/0_stateless/02296_nullable_arguments_in_array_filter.sql b/tests/queries/0_stateless/02296_nullable_arguments_in_array_filter.sql
new file mode 100644
index 00000000000..3c1f2b41909
--- /dev/null
+++ b/tests/queries/0_stateless/02296_nullable_arguments_in_array_filter.sql
@@ -0,0 +1,4 @@
+select arrayFilter(x -> 2 * x > 0, []);
+select arrayFilter(x -> 2 * x > 0, [NULL]);
+select arrayFilter(x -> x % 2 ? NULL : 1, [1, 2, 3, 4]);
+select arrayFilter(x -> x % 2, [1, NULL, 3, NULL]);
diff --git a/tests/queries/0_stateless/02302_s3_file_pruning.reference b/tests/queries/0_stateless/02302_s3_file_pruning.reference
new file mode 100644
index 00000000000..f8d2bdd0612
--- /dev/null
+++ b/tests/queries/0_stateless/02302_s3_file_pruning.reference
@@ -0,0 +1,27 @@
+-- { echo }
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302_{_partition_id}', format=Parquet) partition by a;
+insert into test_02302 select number from numbers(10) settings s3_truncate_on_insert=1;
+select * from test_02302;  -- { serverError 48 }
+drop table test_02302;
+set max_rows_to_read = 1;
+-- Test s3 table function with glob
+select * from s3(s3_conn, filename='test_02302_*', format=Parquet) where _file like '%5';
+5
+-- Test s3 table with explicit keys (no glob)
+-- TODO support truncate table function
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302.2', format=Parquet);
+truncate table test_02302;
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302.1', format=Parquet);
+truncate table test_02302;
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302', format=Parquet);
+truncate table test_02302;
+insert into test_02302 select 0 settings s3_create_new_file_on_insert = true;
+insert into test_02302 select 1 settings s3_create_new_file_on_insert = true;
+insert into test_02302 select 2 settings s3_create_new_file_on_insert = true;
+select * from test_02302 where _file like '%1';
+1
+drop table test_02302;
diff --git a/tests/queries/0_stateless/02302_s3_file_pruning.sql b/tests/queries/0_stateless/02302_s3_file_pruning.sql
new file mode 100644
index 00000000000..624a87506d1
--- /dev/null
+++ b/tests/queries/0_stateless/02302_s3_file_pruning.sql
@@ -0,0 +1,35 @@
+-- Tags: no-parallel, no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+-- { echo }
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302_{_partition_id}', format=Parquet) partition by a;
+insert into test_02302 select number from numbers(10) settings s3_truncate_on_insert=1;
+select * from test_02302;  -- { serverError 48 }
+drop table test_02302;
+
+set max_rows_to_read = 1;
+
+-- Test s3 table function with glob
+select * from s3(s3_conn, filename='test_02302_*', format=Parquet) where _file like '%5';
+
+-- Test s3 table with explicit keys (no glob)
+-- TODO support truncate table function
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302.2', format=Parquet);
+truncate table test_02302;
+
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302.1', format=Parquet);
+truncate table test_02302;
+
+drop table if exists test_02302;
+create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302', format=Parquet);
+truncate table test_02302;
+
+insert into test_02302 select 0 settings s3_create_new_file_on_insert = true;
+insert into test_02302 select 1 settings s3_create_new_file_on_insert = true;
+insert into test_02302 select 2 settings s3_create_new_file_on_insert = true;
+
+select * from test_02302 where _file like '%1';
+drop table test_02302;
diff --git a/tests/queries/0_stateless/02304_grouping_set_order_by.reference b/tests/queries/0_stateless/02304_grouping_set_order_by.reference
new file mode 100644
index 00000000000..c1d666e9167
--- /dev/null
+++ b/tests/queries/0_stateless/02304_grouping_set_order_by.reference
@@ -0,0 +1,8 @@
+2020-01-01 00:00:00		60
+2020-01-01 00:00:00	id0	20
+2020-01-01 00:00:00	id1	20
+2020-01-01 00:00:00	id2	20
+2020-01-01 01:00:00		40
+2020-01-01 01:00:00	id0	14
+2020-01-01 01:00:00	id1	13
+2020-01-01 01:00:00	id2	13
diff --git a/tests/queries/0_stateless/02304_grouping_set_order_by.sql b/tests/queries/0_stateless/02304_grouping_set_order_by.sql
new file mode 100644
index 00000000000..d1b4ab13446
--- /dev/null
+++ b/tests/queries/0_stateless/02304_grouping_set_order_by.sql
@@ -0,0 +1,11 @@
+SELECT toStartOfHour(time) AS timex, id, count()
+FROM
+(
+    SELECT
+        concat('id', toString(number % 3)) AS id,
+        toDateTime('2020-01-01') + (number * 60) AS time
+    FROM numbers(100)
+)
+GROUP BY
+    GROUPING SETS ( (timex, id), (timex))
+ORDER BY timex ASC, id;
diff --git a/tests/queries/0_stateless/02306_part_types_profile_events.reference b/tests/queries/0_stateless/02306_part_types_profile_events.reference
new file mode 100644
index 00000000000..7b5495f39fe
--- /dev/null
+++ b/tests/queries/0_stateless/02306_part_types_profile_events.reference
@@ -0,0 +1,7 @@
+3	1	2
+2	1	1
+Compact
+Compact
+Wide
+Compact	1
+Wide	1
diff --git a/tests/queries/0_stateless/02306_part_types_profile_events.sql b/tests/queries/0_stateless/02306_part_types_profile_events.sql
new file mode 100644
index 00000000000..4b13504612e
--- /dev/null
+++ b/tests/queries/0_stateless/02306_part_types_profile_events.sql
@@ -0,0 +1,44 @@
+DROP TABLE IF EXISTS t_parts_profile_events;
+
+CREATE TABLE t_parts_profile_events (a UInt32)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS min_rows_for_wide_part = 10, min_bytes_for_wide_part = 0;
+
+SYSTEM STOP MERGES t_parts_profile_events;
+
+SET log_comment = '02306_part_types_profile_events';
+
+INSERT INTO t_parts_profile_events VALUES (1);
+INSERT INTO t_parts_profile_events VALUES (1);
+
+SYSTEM START MERGES t_parts_profile_events;
+OPTIMIZE TABLE t_parts_profile_events FINAL;
+SYSTEM STOP MERGES t_parts_profile_events;
+
+INSERT INTO t_parts_profile_events SELECT number FROM numbers(20);
+
+SYSTEM START MERGES t_parts_profile_events;
+OPTIMIZE TABLE t_parts_profile_events FINAL;
+SYSTEM STOP MERGES t_parts_profile_events;
+
+SYSTEM FLUSH LOGS;
+
+SELECT count(), sum(ProfileEvents['InsertedWideParts']), sum(ProfileEvents['InsertedCompactParts'])
+    FROM system.query_log WHERE current_database = currentDatabase()
+        AND log_comment = '02306_part_types_profile_events'
+        AND query ILIKE 'INSERT INTO%' AND type = 'QueryFinish';
+
+SELECT count(), sum(ProfileEvents['MergedIntoWideParts']), sum(ProfileEvents['MergedIntoCompactParts'])
+    FROM system.query_log WHERE current_database = currentDatabase()
+        AND log_comment = '02306_part_types_profile_events'
+        AND query ILIKE 'OPTIMIZE TABLE%' AND type = 'QueryFinish';
+
+SELECT part_type FROM system.part_log WHERE database = currentDatabase()
+    AND table = 't_parts_profile_events' AND event_type = 'NewPart'
+    ORDER BY event_time_microseconds;
+
+SELECT part_type, count() > 0 FROM system.part_log WHERE database = currentDatabase()
+    AND table = 't_parts_profile_events' AND event_type = 'MergeParts'
+    GROUP BY part_type ORDER BY part_type;
+
+DROP TABLE t_parts_profile_events;
diff --git a/tests/queries/0_stateless/02311_create_table_with_unknown_format.reference b/tests/queries/0_stateless/02311_create_table_with_unknown_format.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02311_create_table_with_unknown_format.sql b/tests/queries/0_stateless/02311_create_table_with_unknown_format.sql
new file mode 100644
index 00000000000..54e388c3cf0
--- /dev/null
+++ b/tests/queries/0_stateless/02311_create_table_with_unknown_format.sql
@@ -0,0 +1,6 @@
+-- Tags: no-fasttest, use-hdfs, no-backward-compatibility-check:22.5
+
+create table test_02311 (x UInt32) engine=File(UnknownFormat); -- {serverError UNKNOWN_FORMAT}
+create table test_02311 (x UInt32) engine=URL('http://some/url', UnknownFormat); -- {serverError UNKNOWN_FORMAT}
+create table test_02311 (x UInt32) engine=S3('http://host:2020/test/data', UnknownFormat); -- {serverError UNKNOWN_FORMAT}
+create table test_02311 (x UInt32) engine=HDFS('http://hdfs:9000/data', UnknownFormat); -- {serverError UNKNOWN_FORMAT}
diff --git a/tests/queries/0_stateless/02311_hashed_array_dictionary_hierarchical_functions.reference b/tests/queries/0_stateless/02311_hashed_array_dictionary_hierarchical_functions.reference
new file mode 100644
index 00000000000..7f4ba0901b6
--- /dev/null
+++ b/tests/queries/0_stateless/02311_hashed_array_dictionary_hierarchical_functions.reference
@@ -0,0 +1,35 @@
+Get hierarchy
+[]
+[1]
+[2,1]
+[3,1]
+[4,2,1]
+[]
+Get is in hierarchy
+0
+1
+1
+1
+1
+0
+Get children
+[1]
+[2,3]
+[4]
+[]
+[]
+[]
+Get all descendants
+[1,2,3,4]
+[2,3,4]
+[4]
+[]
+[]
+[]
+Get descendants at first level
+[1]
+[2,3]
+[4]
+[]
+[]
+[]
diff --git a/tests/queries/0_stateless/02311_hashed_array_dictionary_hierarchical_functions.sql b/tests/queries/0_stateless/02311_hashed_array_dictionary_hierarchical_functions.sql
new file mode 100644
index 00000000000..a775f0e5cbf
--- /dev/null
+++ b/tests/queries/0_stateless/02311_hashed_array_dictionary_hierarchical_functions.sql
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS hierarchy_source_table;
+CREATE TABLE hierarchy_source_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog;
+
+INSERT INTO hierarchy_source_table VALUES (1, 0), (2, 1), (3, 1), (4, 2);
+
+DROP DICTIONARY IF EXISTS hierarchy_hashed_array_dictionary;
+CREATE DICTIONARY hierarchy_hashed_array_dictionary
+(
+    id UInt64,
+    parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'hierarchy_source_table'))
+LAYOUT(HASHED_ARRAY())
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Get hierarchy';
+SELECT dictGetHierarchy('hierarchy_hashed_array_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get is in hierarchy';
+SELECT dictIsIn('hierarchy_hashed_array_dictionary', number, number) FROM system.numbers LIMIT 6;
+SELECT 'Get children';
+SELECT dictGetChildren('hierarchy_hashed_array_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get all descendants';
+SELECT dictGetDescendants('hierarchy_hashed_array_dictionary', number) FROM system.numbers LIMIT 6;
+SELECT 'Get descendants at first level';
+SELECT dictGetDescendants('hierarchy_hashed_array_dictionary', number, 1) FROM system.numbers LIMIT 6;
+
+DROP DICTIONARY hierarchy_hashed_array_dictionary;
+
+DROP TABLE hierarchy_source_table;
diff --git a/tests/queries/0_stateless/02313_cross_join_dup_col_names.reference b/tests/queries/0_stateless/02313_cross_join_dup_col_names.reference
new file mode 100644
index 00000000000..96e34d5a44c
--- /dev/null
+++ b/tests/queries/0_stateless/02313_cross_join_dup_col_names.reference
@@ -0,0 +1,2 @@
+\N
+\N
diff --git a/tests/queries/0_stateless/02313_cross_join_dup_col_names.sql b/tests/queries/0_stateless/02313_cross_join_dup_col_names.sql
new file mode 100644
index 00000000000..44a4797ae3c
--- /dev/null
+++ b/tests/queries/0_stateless/02313_cross_join_dup_col_names.sql
@@ -0,0 +1,16 @@
+-- Tags: no-backward-compatibility-check
+
+-- https://github.com/ClickHouse/ClickHouse/issues/37561
+
+SELECT NULL
+FROM
+    (SELECT NULL) AS s1,
+    (SELECT count(2), count(1)) AS s2
+;
+
+SELECT NULL
+FROM
+    (SELECT NULL) AS s1,
+    (SELECT count(2.), 9223372036854775806, count('-1'), NULL) AS s2,
+    (SELECT count('-2147483648')) AS any_query, (SELECT NULL) AS check_single_query
+;
diff --git a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
new file mode 100644
index 00000000000..7d8e0c662cd
--- /dev/null
+++ b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
@@ -0,0 +1,16 @@
+c1	Nullable(Float64)					
+c2	Nullable(Float64)					
+c3	Nullable(Float64)					
+0	1	2
+1	2	3
+2	3	4
+3	4	5
+4	5	6
+c1	Nullable(Float64)					
+c2	Nullable(Float64)					
+c3	Nullable(Float64)					
+0	1	2
+1	2	3
+2	3	4
+3	4	5
+4	5	6
diff --git a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql
new file mode 100644
index 00000000000..ff913a2a3ca
--- /dev/null
+++ b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.sql
@@ -0,0 +1,12 @@
+-- Tags: no-parallel
+
+insert into function file(data_02314.csv) select number, number + 1 from numbers(5) settings engine_file_truncate_on_insert=1;
+insert into function file(data_02314.csv) select number, number + 1, number + 2 from numbers(5);
+desc file(data_02314.csv) settings input_format_csv_skip_first_lines=5;
+select * from file(data_02314.csv) settings input_format_csv_skip_first_lines=5;
+
+insert into function file(data_02314.tsv) select number, number + 1 from numbers(5) settings engine_file_truncate_on_insert=1;
+insert into function file(data_02314.tsv) select number, number + 1, number + 2 from numbers(5);
+desc file(data_02314.tsv) settings input_format_csv_skip_first_lines=5;
+select * from file(data_02314.tsv) settings input_format_csv_skip_first_lines=5;
+
diff --git a/tests/queries/0_stateless/02315_grouping_constant_folding.reference b/tests/queries/0_stateless/02315_grouping_constant_folding.reference
new file mode 100644
index 00000000000..5aa979b1453
--- /dev/null
+++ b/tests/queries/0_stateless/02315_grouping_constant_folding.reference
@@ -0,0 +1,29 @@
+-- { echoOn }
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a), ()) ORDER BY (amount, a, b);
+1	0	0	3
+1	0	2	3
+1	0	4	3
+1	0	6	3
+1	0	8	3
+1	1	1	3
+1	1	3	3
+1	1	5	3
+1	1	7	3
+1	1	9	3
+5	0	0	2
+5	1	0	2
+10	0	0	0
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY ROLLUP(a, b) ORDER BY (amount, a, b);
+1	0	0	3
+1	0	2	3
+1	0	4	3
+1	0	6	3
+1	0	8	3
+1	1	1	3
+1	1	3	3
+1	1	5	3
+1	1	7	3
+1	1	9	3
+5	0	0	2
+5	1	0	2
+10	0	0	0
diff --git a/tests/queries/0_stateless/02315_grouping_constant_folding.sql b/tests/queries/0_stateless/02315_grouping_constant_folding.sql
new file mode 100644
index 00000000000..c4ef087a308
--- /dev/null
+++ b/tests/queries/0_stateless/02315_grouping_constant_folding.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS test02315;
+
+CREATE TABLE test02315(a UInt64, b UInt64) ENGINE=MergeTree() ORDER BY (a, b);
+
+INSERT INTO test02315 SELECT number % 2 as a, number as b FROM numbers(10);
+
+-- { echoOn }
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY GROUPING SETS ((a, b), (a), ()) ORDER BY (amount, a, b);
+
+SELECT count() AS amount, a, b, GROUPING(a, b) FROM test02315 GROUP BY ROLLUP(a, b) ORDER BY (amount, a, b);
+
+-- { echoOff }
+DROP TABLE test02315;
diff --git a/tests/queries/0_stateless/02315_optimize_monotonous_functions_in_order_by_remote.reference b/tests/queries/0_stateless/02315_optimize_monotonous_functions_in_order_by_remote.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/02315_optimize_monotonous_functions_in_order_by_remote.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/02315_optimize_monotonous_functions_in_order_by_remote.sql b/tests/queries/0_stateless/02315_optimize_monotonous_functions_in_order_by_remote.sql
new file mode 100644
index 00000000000..6a5e4a0ae65
--- /dev/null
+++ b/tests/queries/0_stateless/02315_optimize_monotonous_functions_in_order_by_remote.sql
@@ -0,0 +1,6 @@
+SET prefer_localhost_replica = 1;
+SET optimize_monotonous_functions_in_order_by = 1;
+
+SELECT *
+FROM cluster(test_cluster_two_shards_localhost, system, one)
+ORDER BY toDateTime(dummy);
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
index 794ee47d757..3bf762ed7d5 100644
--- a/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
@@ -1 +1 @@
-`a1` Array(Int8), `a2` Array(UInt8), `a3` Array(Int16), `a4` Array(UInt16), `a5` Array(Int32), `a6` Array(UInt32), `a7` Array(Int64), `a8` Array(UInt64), `a9` Array(String), `a10` Array(FixedString(4)), `a11` Array(Float32), `a12` Array(Float64), `a13` Array(Date), `a14` Array(Datetime('Europe/Moscow')), `a15` Array(Decimal(4, 2)), `a16` Array(Decimal(10, 2)), `a17` Array(Decimal(25, 2))
+`a1` Array(Int8), `a2` Array(UInt8), `a3` Array(Int16), `a4` Array(UInt16), `a5` Array(Int32), `a6` Array(UInt32), `a7` Array(Int64), `a8` Array(UInt64), `a9` Array(String), `a10` Array(FixedString(4)), `a11` Array(Float32), `a12` Array(Float64), `a13` Array(Date), `a14` Array(Datetime('Asia/Istanbul')), `a15` Array(Decimal(4, 2)), `a16` Array(Decimal(10, 2)), `a17` Array(Decimal(25, 2))
diff --git a/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns b/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
index df35127ede8..c6d754f04c7 100644
--- a/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
@@ -1 +1 @@
-`a` Nullable(Int64), `b` Nullable(Float64), `c` Nullable(DateTime('Europe/Moscow')), `index` Nullable(String), `__index_level_1__` Nullable(DateTime('Europe/Moscow'))
+`a` Nullable(Int64), `b` Nullable(Float64), `c` Nullable(DateTime('Asia/Istanbul')), `index` Nullable(String), `__index_level_1__` Nullable(DateTime('Asia/Istanbul'))
diff --git a/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py b/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
index b69bf7c8d11..1b35174af0f 100755
--- a/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
+++ b/tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
@@ -4,8 +4,8 @@ import json
 import sys
 
 TYPE_PARQUET_CONVERTED_TO_CLICKHOUSE = {
-    "TIMESTAMP_MICROS": "DateTime('Europe/Moscow')",
-    "TIMESTAMP_MILLIS": "DateTime('Europe/Moscow')",
+    "TIMESTAMP_MICROS": "DateTime('Asia/Istanbul')",
+    "TIMESTAMP_MILLIS": "DateTime('Asia/Istanbul')",
     "UTF8": "String",
 }
 
diff --git a/tests/queries/1_stateful/00156_max_execution_speed_sample_merge.sql b/tests/queries/1_stateful/00156_max_execution_speed_sample_merge.sql
index 37e91296f14..e325c18200b 100644
--- a/tests/queries/1_stateful/00156_max_execution_speed_sample_merge.sql
+++ b/tests/queries/1_stateful/00156_max_execution_speed_sample_merge.sql
@@ -1,4 +1,4 @@
-SET max_execution_speed = 4000000, timeout_before_checking_execution_speed = 0.001;
+SET max_execution_speed = 4000000, timeout_before_checking_execution_speed = 0;
 
 CREATE TEMPORARY TABLE times (t DateTime);
 
diff --git a/tests/queries/1_stateful/00170_s3_cache.reference b/tests/queries/1_stateful/00170_s3_cache.reference
index 96b02595c2e..04d610bc8d2 100644
--- a/tests/queries/1_stateful/00170_s3_cache.reference
+++ b/tests/queries/1_stateful/00170_s3_cache.reference
@@ -2,6 +2,7 @@
 
 SET enable_filesystem_cache_on_write_operations=0;
 SET max_memory_usage='20G';
+SYSTEM DROP FILESYSTEM CACHE;
 SELECT count() FROM test.hits_s3;
 8873898
 SELECT count() FROM test.hits_s3 WHERE AdvEngineID != 0;
diff --git a/tests/queries/1_stateful/00170_s3_cache.sql b/tests/queries/1_stateful/00170_s3_cache.sql
index febabb1c9e4..b03b2a16bf0 100644
--- a/tests/queries/1_stateful/00170_s3_cache.sql
+++ b/tests/queries/1_stateful/00170_s3_cache.sql
@@ -4,6 +4,7 @@
 
 SET enable_filesystem_cache_on_write_operations=0;
 SET max_memory_usage='20G';
+SYSTEM DROP FILESYSTEM CACHE;
 SELECT count() FROM test.hits_s3;
 SELECT count() FROM test.hits_s3 WHERE AdvEngineID != 0;
 SELECT sum(AdvEngineID), count(), avg(ResolutionWidth) FROM test.hits_s3 ;
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index 7699e803f76..ce5947d95ed 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -19,9 +19,9 @@ export CLICKHOUSE_TEST_UNIQUE_NAME="${CLICKHOUSE_TEST_NAME}_${CLICKHOUSE_DATABAS
 [ -v CLICKHOUSE_PORT_TCP ] && CLICKHOUSE_BENCHMARK_OPT0+=" --port=${CLICKHOUSE_PORT_TCP} "
 [ -v CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL ] && CLICKHOUSE_CLIENT_OPT0+=" --send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL} "
 [ -v CLICKHOUSE_DATABASE ] && CLICKHOUSE_CLIENT_OPT0+=" --database=${CLICKHOUSE_DATABASE} "
-[ -v CLICKHOUSE_LOG_COMMENT ] && CLICKHOUSE_CLIENT_OPT0+=" --log_comment $(printf '%q' ${CLICKHOUSE_LOG_COMMENT}) "
+[ -v CLICKHOUSE_LOG_COMMENT ] && CLICKHOUSE_CLIENT_OPT0+=" --log_comment='${CLICKHOUSE_LOG_COMMENT}' "
 [ -v CLICKHOUSE_DATABASE ] && CLICKHOUSE_BENCHMARK_OPT0+=" --database=${CLICKHOUSE_DATABASE} "
-[ -v CLICKHOUSE_LOG_COMMENT ] && CLICKHOUSE_BENCHMARK_OPT0+=" --log_comment $(printf '%q' ${CLICKHOUSE_LOG_COMMENT}) "
+[ -v CLICKHOUSE_LOG_COMMENT ] && CLICKHOUSE_BENCHMARK_OPT0+=" --log_comment='${CLICKHOUSE_LOG_COMMENT}' "
 
 export CLICKHOUSE_BINARY=${CLICKHOUSE_BINARY:="clickhouse"}
 # client
@@ -129,37 +129,3 @@ function clickhouse_client_removed_host_parameter()
     # bash regex magic is arcane, but version dependant and weak; sed or awk are not really portable.
     $(echo "$CLICKHOUSE_CLIENT"  | python3 -c "import sys, re; print(re.sub('--host(\s+|=)[^\s]+', '', sys.stdin.read()))") "$@"
 }
-
-function clickhouse_client_timeout()
-{
-    local timeout=$1 && shift
-    timeout -s INT "$timeout" "$@"
-}
-# Helper function to stop the clickhouse-client after SIGINT properly.
-function clickhouse_client_loop_timeout()
-{
-    local timeout=$1 && shift
-
-    local cmd
-    cmd="$(printf '%q ' "$@")"
-
-    timeout -s INT "$timeout" bash -c "trap 'STOP_THE_LOOP=1' INT; while true; do [ ! -v STOP_THE_LOOP ] || break; $cmd; done"
-}
-# wait for queries to be finished
-function clickhouse_test_wait_queries()
-{
-    local timeout=${1:-"600"} && shift
-    local query_id="wait-$CLICKHOUSE_TEST_UNIQUE_NAME"
-    local query="SELECT count() FROM system.processes WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id != '$query_id'"
-    local i=0
-    (( timeout*=2 ))
-    while [[ "$(${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query_id=$query_id" --data-binary "$query")" != "0" ]]; do
-        sleep 0.5
-
-        (( ++i ))
-        if [[ $i -gt $timeout ]]; then
-            echo "clickhouse_test_wait_queries: timeout exceeded"
-            exit 1
-        fi
-    done
-}
diff --git a/utils/c++expr b/utils/c++expr
index c498e780d05..c70a4c7d382 100755
--- a/utils/c++expr
+++ b/utils/c++expr
@@ -98,7 +98,7 @@ find_clickhouse_root () {
             echo "error: $DIR has no CMakeLists.txt"
             return 1
         fi
-        if grep "project(ClickHouse)" "$DIR/CMakeLists.txt" >/dev/null 2>&1; then
+        if grep "project(ClickHouse" "$DIR/CMakeLists.txt" >/dev/null 2>&1; then
             echo $DIR
             return 0
         fi
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 84ce7ae5742..406b36e9251 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -340,3 +340,6 @@ fi
 
 # Forbid files that differ only by character case
 find $ROOT_PATH | sort -f | uniq -i -c | awk '{ if ($1 > 1) print }'
+
+# Forbid recursive submodules
+find $ROOT_PATH/contrib -name '.gitmodules' -size +0 | xargs cat | grep -P '.' && echo "Recursive submodules are forbidden."
diff --git a/utils/check-style/check-workflows b/utils/check-style/check-workflows
index 6e9cb87ed36..df2292d84ca 100755
--- a/utils/check-style/check-workflows
+++ b/utils/check-style/check-workflows
@@ -6,4 +6,4 @@ GIT_ROOT=$(git rev-parse --show-cdup)
 GIT_ROOT=${GIT_ROOT:-.}
 act --list --directory="$GIT_ROOT" 1>/dev/null 2>&1 || act --list --directory="$GIT_ROOT" 2>&1
 
-actionlint || :
+actionlint -ignore 'reusable workflow call.+' || :
diff --git a/utils/security-generator/SECURITY.md.sh b/utils/security-generator/SECURITY.md.sh
new file mode 100755
index 00000000000..97c696c1227
--- /dev/null
+++ b/utils/security-generator/SECURITY.md.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# This is a script to automate the SECURITY.md generation in the repository root.
+# The logic is the following:
+# We support the latest ClickHouse Y.M stable release,
+# the two releases before the latest stable,
+# and the two latest LTS releases (which may be already included by the criteria above).
+# The LTS releases are every Y.3 and Y.8 stable release.
+
+echo "
+# Security Policy
+
+## Security Announcements
+Security fixes will be announced by posting them in the [security changelog](https://clickhouse.com/docs/en/whats-new/security-changelog/).
+
+## Scope and Supported Versions
+
+The following versions of ClickHouse server are currently being supported with security updates:
+"
+
+clickhouse-local --query "
+SELECT
+    y::String || '.' || (y < toYear(today()) - 2000 - 1 ? '*' : m::String) AS Version,
+    (n <= 3 OR (is_lts AND lts_n <= 2)) ? '✔️' : '❌' AS Supported
+FROM
+(
+    SELECT
+        y,
+        m,
+        count() OVER (ORDER BY y DESC, m DESC) AS n,
+        m IN (3, 8) AS is_lts,
+        countIf(is_lts) OVER (ORDER BY y DESC, m DESC) AS lts_n
+    FROM
+    (
+        WITH
+            extractGroups(version, 'v(\\d+).(\\d+)') AS v,
+            v[1]::UInt8 AS y,
+            v[2]::UInt8 AS m
+        SELECT
+            y,
+            m
+        FROM file('$(dirname "${BASH_SOURCE[0]}")/../list-versions/version_date.tsv', TSV, 'version String, date String')
+        ORDER BY
+            y DESC,
+            m DESC
+        LIMIT 1 BY
+            y,
+            m
+    )
+)
+LIMIT 1 BY Version
+FORMAT Markdown"
+
+echo "
+## Reporting a Vulnerability
+
+We're extremely grateful for security researchers and users that report vulnerabilities to the ClickHouse Open Source Community. All reports are thoroughly investigated by developers.
+
+To report a potential vulnerability in ClickHouse please send the details about it to [security@clickhouse.com](mailto:security@clickhouse.com).
+
+### When Should I Report a Vulnerability?
+
+- You think you discovered a potential security vulnerability in ClickHouse
+- You are unsure how a vulnerability affects ClickHouse
+
+### When Should I NOT Report a Vulnerability?
+
+- You need help tuning ClickHouse components for security
+- You need help applying security related updates
+- Your issue is not security related
+
+## Security Vulnerability Response
+
+Each report is acknowledged and analyzed by ClickHouse maintainers within 5 working days.
+As the security issue moves from triage, to identified fix, to release planning we will keep the reporter updated.
+
+## Public Disclosure Timing
+
+A public disclosure date is negotiated by the ClickHouse maintainers and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to 90 days. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days. 
+"
diff --git a/website/blog/README.md b/website/blog/README.md
deleted file mode 100644
index 2c29eda459b..00000000000
--- a/website/blog/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## Introduction
-
-First of all, **relevant guest posts are welcome**! Especially with success stories or demonstration of ClickHouse ecosystem projects.
-
-The ClickHouse blog is published alongside documentation and the rest of official website. So the posts reside in this same repository in [Markdown](https://github.com/ClickHouse/ClickHouse/tree/master/docs#markdown-cheatsheet) format.
-
-## How To Add a New Post?
-
-Basically you need to create a new Markdown file at the following location inside repository `/website/blog/<lang>/<year>/<post-slug>.md` and then [open a pull-request](https://github.com/ClickHouse/ClickHouse/compare) with it. You can do it even right from the GitHub web interface using the "Create new file" button.
-
-Each post needs to have a `yaml` meta-header with the following fields:
-
--   Required:
-    -   `title`, main name of the article. In Title Case for English.
-    -   `date`, publication date in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) format, like `YYYY-MM-DD` (can be in future to postpone publication).
--   Optional:
-    -   `image`, URL to main post image.
-    -   `tags`, list of post tags.
- 
-Then after header goes post content in a normal markdown (with some optional extensions).
- 
-The recommended place to store images is this GitHub repo: <https://github.com/ClickHouse/clickhouse-blog-images>. It's folder structure matches this folder with blog posts:
-
--   `<lang>/<year>/<post-slug>/main.jpg` for main post image (linked in `image` header field).
--   `<lang>/<year>/<post-slug>/whatever.jpg` for other images (`png` or `gif` are acceptable as well, if necessary).
-
-### Example
- ```markdown
----
-title: 'ClickHouse Meetup in Beijing on June 8, 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/main.jpg'
-date: '2019-06-13'
-tags: ['meetup','Beijing','China','events']
----
-
-24th ClickHouse Meetup globally and 3rd one in China took place in Beijing on Dragon Boat Festival weekend, which appeared to...
-
-![ClickHouse branded Beijing duck](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/9.jpg)
-```
-
-## How To Preview My Post?
-
-Use [deploy-to-test.sh](https://github.com/ClickHouse/ClickHouse/blob/master/docs/tools/deploy-to-test.sh) script. Note that on the first use you'll need to follow the steps in its first comment, and [install prerequisites for build.py](https://github.com/ClickHouse/ClickHouse/blob/master/docs/tools/README.md#use-buildpy-use-build-py). Alternatively, you can use `--livereload=N` argument of [build.py](https://github.com/ClickHouse/ClickHouse/blob/master/docs/tools/build.py).
-
-## How To Add a New Blog Language?
-
-If you want to write a guest post, you are welcome to use your native language or make multiple posts in multiple languages
- 
-Unlike documentation, blog languages are independent, i.e. they have partially overlapping sets of posts and it's ok. Most posts are written only in one language because they are not relevant to audiences of other languages.
-
-At the moment it's not so straightforward to set up a new language for blog and it won't be documented for now, but you can just create a language directory with the first post as described above and we'll configure the website infrastructure to include it during/after merging the pull-request.
diff --git a/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md b/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md
deleted file mode 100644
index 3e717e467c1..00000000000
--- a/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-title: 'Evolution of Data Structures in Yandex.Metrica'
-image: 'https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/main.jpg'
-date: '2016-12-13'
-tags: ['Yandex.Metrica', 'data structures', 'LSM tree', 'columnar storage']
-author: 'Alexey Milovidov'
----
-
-[Yandex.Metrica](https://metrica.yandex.com/) takes in a stream of data representing events that took place on sites or on apps. Our task is to keep this data and present it in an analyzable form. The real challenge lies in trying to determine what form the processed results should be saved in so that they are easy to work with. During the development process, we had to completely change our approach to data storage organization several times. We started with MyISAM tables, then used LSM-trees and eventually came up with column-oriented database, ClickHouse.
-
-At its founding, Metrica was designed as an offshoot of Yandex.Direct, the search ads service. MySQL tables with MyISAM engine were used in Direct to store statistics and it was natural to use same approach in Metrica. Initially Yandex.Metrica for websites had more than 40 “fixed” report types (for example, the visitor geography report), several in-page analytics tools (like click maps), Webvisor (tool to study individual user actions in great detail), as well as the separate report constructor. But with time to keep up with business goals the system had to become more flexible and provide more customization opportunities for customers. Nowadays instead of using fixed reports Metrica allows to freely add new dimensions (for example, in a keyword report you can break data down further by landing page), segment and compare (between, let's say, traffic sources for all visitors vs. visitors from Moscow), change your set of metrics, etc. These features demanded a completely different approach to data storage than what we used with MyISAM, we will further discuss this transition from technical perspective.
-
-## MyISAM
-
-Most SELECT queries that fetch data for reports are made with the conditions WHERE CounterID = AND Date BETWEEN min_date AND max_date. Sometimes there is also filter by region, so it made sense to use complex primary key to turn this into primary key range is read. So table schema for Metrica looks like this: CounterID, Date, RegionID -> Visits, SumVisitTime, etc. Now we'll take a look at what happens when it comes in.
-
-A MyISAM table is comprised of a data file and an index file. If nothing was deleted from the table and the rows did not change in length during updating, the data file will consist of serialized rows arranged in succession in the order that they were added. The index (including the primary key) is a B-tree, where the leaves contain offsets in the data file. When we read index range data, a lot of offsets in the data file are taken from the index. Then reads are issued for this set of offsets in the data file.
-
-Let's look at the real-life situation when the index is in RAM (key cache in MySQL or system page cache), but the table data is not cached. Let's assume that we are using HDDs. The time it takes to read data depends on the volume of data that needs to be read and how many Seek operations need to be run. The number of Seek's is determined by the locality of data on the disk.
-
-Data locality illustrated:
-![Data locality](https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/1.jpg)
-
-Metrica events are received in almost the same order in which they actually took place. In this incoming stream, data from different counters is scattered completely at random. In other words, incoming data is local by time, but not local by CounterID. When writing to a MyISAM table, data from different counters is also placed quite randomly. This means that to read the data report, you will need to perform about as many random reads as there are rows that we need in the table.
-
-A typical 7200 rpm hard disk can perform 100 to 200 random reads per second. A RAID, if used properly, can handle the same amount multiplied by number of disks in it. One five-year-old SSD can perform 30,000 random reads per second, but we cannot afford to keep our data on SSD. So in this case, if we needed to read 10,000 rows for a report, it would take more than 10 seconds, which would be totally unacceptable.
-
-InnoDB is much better suited to reading primary key ranges since it uses [a clustered primary key](https://en.wikipedia.org/wiki/Database_index#Clustered) (i.e., the data is stored in an orderly manner on the primary key). But InnoDB was impossible to use due to its slow write speed. If this reminds you of [TokuDB](https://www.percona.com/software/mysql-database/percona-tokudb), then read on.
-
-It took a lot of tricks like periodic table sorting, complicated manual partitioning schemes, and keeping data in generations to keep Yandex.Metrica working on MyISAM. This approach also had a lot of lot of operational drawbacks, for example slow replication, consistency, unreliable recovery, etc. Nevertheless, as of 2011, we stored more than 580 billion rows in MyISAM tables.
-
-## Metrage and OLAPServer
-
-Metrage is an implementation of [LSM Tree](https://en.wikipedia.org/wiki/Log-structured_merge-tree), a fairly common data structure that works well for workloads with intensive stream of writes and mostly primary key reads, like Yandex.Metrica has. LevelDB did not exist in 2010 and TokuDB was proprietary at the time.
-
-![LSM Tree](https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/2.jpg)
-
-In Metrage arbitrary data structures (fixed at compile time) can be used as “rows” in it. Every row is a key, value pair. A key is a structure with comparison operations for equality and inequality. The value is an arbitrary structure with operations to update (to add something) and merge (to aggregate or combine with another value). In short, it's a CRDT. Data is located pretty locally on the hard disk, so the primary key range reads are quick. Blocks of data are effectively compressed even with fast algorithms because of ordering (in 2010 we used QuickLZ, since 2011 - LZ4). Storing data in a systematic manner enables us to use a sparse index.
-
-Since reading is not performed very often (even though lot of rows are read when it does) the increase in latency due to having many chunks and decompressing the data block does not matter. Reading extra rows because of the index sparsity also does not make a difference.
-
-After transferring reports from MyISAM to Metrage, we immediately saw an increase in Metrica interface speed. Whereas earlier the 90% of page-title reports loaded in 26 seconds, with Metrage they loaded in 0.8 seconds (total time, including time to process all database queries and follow-up data transformations). The time it takes Metrage itself to process queries (for all reports) is as follows according to percent: average = 6 ms, 90tile = 31 ms, 99tile = 334 ms.
-
-We've been using Metrage for five years and it has proved to be a reliable solution. As of 2015 we stored 3.37 trillion rows in Metrage and used 39 * 2 servers for this.
-
-Its advantages were simplicity and effectiveness, which made it a far better choice for storing data than MyISAM. Though the system still had one huge drawback: it really only works effectively with fixed reports. Metrage aggregates data and saves aggregated data. But in order to do this, you have to list all the ways in which you want to aggregate data ahead of time. So if we do this in 40 different ways, it means that Metrica will contain 40 types of reports and no more.
-
-To mitigate this we had to keep for a while a separate storage for custom report wizard, called OLAPServer. It is a simple and very limited implementation of a column-oriented database. It supports only one table set in compile time — a session table. Unlike Metrage, data is not updated in real-time, but rather a few times per day. The only data type supported is fixed-length numbers of 1-8 bytes, so it wasn“t suitable for reports with other kinds of data, for example URLs.
-
-## ClickHouse
-
-Using OLAPServer, we developed an understanding of how well column-oriented DBMS's handle ad-hoc analytics tasks with non-aggregated data. If you can retrieve any report from non-aggregated data, then it begs the question of whether data even needs to be aggregated in advance, as we did with Metrage.
-
-![](https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/3.gif)
-
-On the one hand, pre-aggregating data can reduce the volume of data that is used at the moment when the report page is loading. On the other hand, though, aggregated data doesn't solve everything. Here are the reasons why:
-
--   you need to have a list of reports that your users need ahead of time; in other words, the user can't put together a custom report
--   when aggregating a lot of keys, the amount of data is not reduced and aggregation is useless; when there are a lot of reports, there are too many aggregation options (combinatorial explosion)
--   when aggregating high cardinality keys (for example, URLs) the amount of data does not decrease by much (by less than half)
-due to this, the amount of data may not be reduced, but actually grow during aggregation
--   users won't view all the reports that we calculate for them (in other words, a lot of the calculations prove useless)
--   it's difficult to maintain logical consistency when storing a large number of different aggregations
-
-As you can see, if nothing is aggregated and we work with non-aggregated data, then it's possible that the volume of computations will even be reduced. But only working with non-aggregated data imposes very high demands on the effectiveness of the system that executes the queries.
-
-So if we aggregate the data in advance, then we should do it constantly (in real time), but asynchronously with respect to user queries. We should really just aggregate the data in real time; a large portion of the report being received should consist of prepared data.
-
-If data is not aggregated in advance, all the work has to be done at the moment the user request it (i.e. while they wait for the report page to load). This means that many billions of rows need to be processed in response to the user's query; the quicker this can be done, the better.
-
-For this you need a good column-oriented DBMS. The market didn‘t have any column-oriented DBMS's that would handle internet-analytics tasks on the scale of Runet (the Russian internet) well enough and would not be prohibitively expensive to license.
-
-Recently, as an alternative to commercial column-oriented DBMS's, solutions for efficient ad-hoc analytics of data in distributed computing systems began appearing: Cloudera Impala, Spark SQL, Presto, and Apache Drill. Although such systems can work effectively with queries for internal analytical tasks, it is difficult to imagine them as the backend for the web interface of an analytical system accessible to external users.
-
-At Yandex, we developed and later opensourced our own column-oriented DBMS — ClickHouse. Let's review the basic requirements that we had in mind before we proceeded to development.
-
-**Ability to work with large datasets.** In current Yandex.Metrica for websites, ClickHouse is used to store all data for reports. As of November, 2016, the database is comprised of 18.3 trillion rows. It‘s made up of non-aggregated data that is used to retrieve reports in real-time. Every row in the largest table contains over 200 columns.
-
-**The system should scale linearly.** ClickHouse allows you to increase the size of cluster by adding new servers as needed. For example, Yandex.Metrica's main cluster has increased from 60 to 426 servers in three years. In the aim of fault tolerance, our servers are spread across different data centers. ClickHouse can use all hardware resources to process a single query. This way more than 2 terabyte can be processed per second.
-
-**High efficiency.** We especially pride ourselves on our database's high performance. Based on the results of internal tests, ClickHouse processes queries faster than any other system we could acquire. For example, ClickHouse works an average of 2.8-3.4 times faster than Vertica. With ClickHouse there is no one silver bullet that makes the system work so quickly.
-
-**Functionality should be sufficient for Web analytics tools.** The database supports the SQL language dialect, subqueries and JOINs (local and distributed). There are numerous SQL extensions: functions for web analytics, arrays and nested data structures, higher-order functions, aggregate functions for approximate calculations using sketching, etc. By working with ClickHouse, you get the convenience of a relational DBMS.
-
-ClickHouse was initially developed by the Yandex.Metrica team. Furthermore, we were able to make the system flexible and extensible enough that it can be successfully used for different tasks. Although the database can run on large clusters, it can be installed on one server or even on a virtual machine. There are now more than a dozen different ClickHouse applications within our company.
-
-ClickHouse is well equipped for creating all kinds of analytical tools. Just consider: if the system can handle the challenges of Yandex.Metrica, you can be sure that ClickHouse will cope with other tasks with a lot of performance headroom to spare.
-
-ClickHouse works well as a time series database; at Yandex it is commonly used as the backend for Graphite instead of Ceres/Whisper. This lets us work with more than a trillion metrics on a single server.
-
-ClickHouse is used by analytics for internal tasks. Based on our experience at Yandex, ClickHouse performs at about three orders of magnitude higher than traditional methods of data processing (scripts on MapReduce). But this is not a simple quantitative difference. The fact of the matter is that by having such a high calculation speed, you can afford to employ radically different methods of problem solving.
-
-If an analyst has to make a report and they are competent at their job, they won't just go ahead and construct one report. Rather, they will start by retrieving dozens of other reports to better understand the nature of the data and test various hypotheses. It is often useful to look at data from different angles in order to posit and check new hypotheses, even if you don't have a clear goal.
-
-This is only possible if the data analysis speed allows you to conduct online research. The faster queries are executed, the more hypotheses you can test. Working with ClickHouse, one even gets the sense that they are able to think faster.
-
-In traditional systems, data is like a dead weight, figuratively speaking. You can manipulate it, but it takes a lot of time and is inconvenient. If your data is in ClickHouse though, it is much more malleable: you can study it in different cross-sections and drill down to the individual rows of data.
-
-## Conclusions
-
-Yandex.Metrica has become the second largest web-analytics system in the world. The volume of data that Metrica takes in grew from 200 million events a day in 2009 to more than 25 billion in 2016. In order to provide users with a wide variety of options while still keeping up with the increasing workload, we've had to constantly modify our approach to data storage.
-
-Effective hardware utilization is very important to us. In our experience, when you have a large volume of data, it's better not to worry as much about how well the system scales and instead focus on how effectively each unit of resource is used: each processor core, disk and SSD, RAM, and network. After all, if your system is already using hundreds of servers, and you have to work ten times more efficiently, it is unlikely that you can just proceed to install thousands of servers, no matter how scalable your system is.
-
-To maximize efficiency, it's important to customize your solution to meet the needs of specific type of workload. There is no data structure that copes well with completely different scenarios. For example, it's clear that key-value databases don't work for analytical queries. The greater the load on the system, the narrower the specialization required. One should not be afraid to use completely different data structures for different tasks.
-
-We were able to set things up so that Yandex.Metrica's hardware was relatively inexpensive. This has allowed us to offer the service free of charge to even very large sites and mobile apps, even larger than Yanex‘s own, while competitors typically start asking for a paid subscription plan.
diff --git a/website/blog/en/2016/how-to-update-data-in-clickhouse.md b/website/blog/en/2016/how-to-update-data-in-clickhouse.md
deleted file mode 100644
index 951fb957d13..00000000000
--- a/website/blog/en/2016/how-to-update-data-in-clickhouse.md
+++ /dev/null
@@ -1,169 +0,0 @@
----
-title: 'How to Update Data in ClickHouse'
-date: '2016-11-20'
-image: 'https://blog-images.clickhouse.com/en/2016/how-to-update-data-in-clickhouse/main.jpg'
-tags: ['features', 'update', 'delete', 'CollapsingMergeTree', 'partitions']
----
-
-There is no UPDATE or DELETE commands in ClickHouse at the moment. And that's not because we have some religious believes. ClickHouse is performance-oriented system; and data modifications are hard to store and process optimally in terms of performance.
-
-But sometimes we have to modify data. And sometimes data should be updated in realtime. Don't worry, we have these cases covered.
-
-## Work with Partitions
-
-Data in MergeTree engine family is partitioned by partition_key engine parameter. MergeTree split all the data by this partition key. Partition size is one month.
-
-That's very useful in many terms. Especially when we're talking about data modification.
-
-## Yandex.Metrica "hits" Table
-
-Let's look at an example on Yandex.Metrica server mtlog02-01-1 which store some Yandex.Metrica data for year 2013. Table we are looking at contains user events we call “hits”. This is the engine description for hits table:
-
-``` text
-ENGINE = ReplicatedMergeTree(
-    '/clickhouse/tables/{layer}-{shard}/hits', -- zookeeper path
-    '{replica}', -- settings in config describing replicas
-    EventDate, -- partition key column
-    intHash32(UserID), -- sampling key
-    (CounterID, EventDate, intHash32(UserID), WatchID), -- index
-    8192 -- index granularity
-)
-```
-
-You can see that the partition key column is EventDate. That means that all the data will be splitted by months using this column.
-
-With this SQL we can get partitions list and some stats about current partitions:
-
-```sql
-SELECT 
-    partition, 
-    count() as number_of_parts, 
-    formatReadableSize(sum(bytes)) as sum_size 
-FROM system.parts 
-WHERE 
-    active 
-    AND database = 'merge' 
-    AND table = 'hits' 
-GROUP BY partition 
-ORDER BY partition;
-```
-```text
-┌─partition─┬─number_of_parts─┬─sum_size───┐
-│ 201306    │               1 │ 191.34 GiB │
-│ 201307    │               4 │ 537.86 GiB │
-│ 201308    │               6 │ 608.77 GiB │
-│ 201309    │               5 │ 658.68 GiB │    
-│ 201310    │               5 │ 768.74 GiB │
-│ 201311    │               5 │ 654.61 GiB │
-└───────────┴─────────────────┴────────────┘
-```
-There are 6 partitions with a few parts in each of them. Each partition is around 600 Gb of data. Partition is strictly one piece of data for partition key, here we can see that it is months. Part is one piece of data inside partition. Basically it's one node of LSMT structure, so there are not so many of them, especially for old data. If there are too many of them, they merge and form bigger ones.
-
-## Partition Operations
-
-There is a nice set of operations to work with partitions:
-
--   `DETACH PARTITION` - Move a partition to the 'detached' directory and forget it.
--   `DROP PARTITION` - Delete a partition.
--   `ATTACH PART|PARTITION` -- Add a new part or partition from the 'detached' directory to the table.
--   `FREEZE PARTITION` - Create a backup of a partition.
--   `FETCH PARTITION` - Download a partition from another server.
-
-We can do any data management operations on partitions level: move, copy and delete. Also, special DETACH and ATTACH operations are created to simplify data manipulation. DETACH detaches partition from table, moving all data to detached directory. Data is still there and you can copy it anywhere but detached data is not visible on request level. ATTACH is the opposite: attaches data from detached directory so it become visible.
-
-This attach-detach commands works almost in no time so you can make your updates almost transparently to database clients.
-
-Here is the plan how to update data using partitions:
-
--   Create modified partition with updated data on another table
--   Copy data for this partition to detached directory
--   `DROP PARTITION` in main table
--   `ATTACH PARTITION` in main table
-
-Partition swap especially useful for huge data updates with low frequency. But they're not so handy when you need to update a lot of data in real time.
-
-## Update Data on the Fly
-
-In Yandex.Metrica we have user sessions table. Each row is one session on a website: some pages checked, some time spent, some banners clicked. This data is updated every second: user on a website view more pages, click more buttons, and do other things. Site owner can see that actions in Yandex.Metrica interface in real time.
-
-So how do we do that?
-
-We update data not by updating that data, but adding more data about what have changed. This is usually called CRDT approach, and there is an article on Wikipedia about that.
-
-It was created to solve conflict problem in transactions but this concept also allows updating data. We use our own data model with this approach. We call it Incremental Log.
-
-## Incremental Log
-
-Let's look at an example.
-
-Here we have one session information with user identifier UserID, number of page viewed PageViews, time spent on site in seconds Duration. There is also Sign field, we describe it later.
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-And let's say we calculate some metrics over this data.
-
--   `count()`- number of sessions
--   `sum(PageViews)`- total number of pages all users checked
--   `avg(Duration)` - average session duration, how long user usually spent on the website
-
-Let's say now we have update on that: user checked one more page, so we should change PageViews from 5 to 6 and Duration from 146 to 185.
-
-We insert two more rows:
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-First one is delete row. It's exactly the same row what we already have there but with Sign set to -1. Second one is updated row with all data set to new values.
-
-After that we have three rows of data:
-``` text
-┌──────────────UserID─┬─PageViews─┬─Duration─┬─Sign─┐
-│ 4324182021466249494 │         5 │      146 │    1 │
-│ 4324182021466249494 │         5 │      146 │   -1 │
-│ 4324182021466249494 │         6 │      185 │    1 │
-└─────────────────────┴───────────┴──────────┴──────┘
-```
-
-The most important part is modified metrics calculation. We should update our queries like this:
-
-``` text
- -- number of sessions
-count() -> sum(Sign)
- -- total number of pages all users checked
-sum(PageViews) -> sum(Sign * PageViews)
- -- average session duration, how long user usually spent on the website
-avg(Duration) -> sum(Sign * Duration) / sum(Sign)
-```
-
-You can see that it works as expected over this data. Deleted row 'hide' old row, same values come with + and - signs inside aggregation and annihilate each other.
-
-Moreover, it works totally fine with changing keys for grouping. If we want to group data by PageViews, all data for PageView = 5 will be 'hidden' for this rows.
-
-There are some limitations with this approach:
-
--   It works only for metrics which can be presented through this Sign operations. It covers most cases, but it's not possible to calculate min or max values. There is an impact to uniq calculations also. But it's fine at least for Yandex.Metrica cases, and there are a lot of different analytical calculations;
--   You need to remember somehow old value in external system doing updates, so you can insert this 'delete' rows;
--   Some other effects; there is a [great answer](https://groups.google.com/forum/#!msg/clickhouse/VixyOUD-K68/Km8EpkCyAQAJ) on Google Groups.
-
-## CollapsingMergeTree
-
-ClickHouse has support of Incremental Log model in Collapsing engines family.
-
-If you use Collapsing family, 'delete' row and old 'deleted' rows will collapse during merge process. Merge is a background process of merging data into larger chunks. Here is a great article about merges and LSMT structures.
-
-For most cases 'delete' and 'deleted' rows will be removed in terms of days. What's important here is that you will not have any significant overhead on data size. Using Sign field on selects still required.
-
-Also there is FINAL modifier available over Collapsing family. Using FINAL guarantees that user will see already collapsing data, thus using Sign field isn't required. FINAL usually make tremendous performance degradation because ClickHouse have to group data by key and delete rows during SELECT execution. But it's useful when you want to check your queries or if you want to see raw, unaggregated data in their final form.
-
-## Future Plans
-
-We know that current feature set is not enough. There are some cases which do not fit to limitations. But we have huge plans, and here are some insights what we've preparing:
-
--   Partitions by custom key: current partitioning scheme is binded to months only. We will remove this limitation and it will be possible to create partitions by any key. All partition operations like FETCH PARTITION will be available.
--   UPDATE and DELETE: there are a lot of issues with updates and deletes support. Performance degradation, consistency guarantees, distributed queries and more. But we believe that if you need to update few rows of data in your dataset, it should not be painful. It will be done.
-
diff --git a/website/blog/en/2016/yandex-opensources-clickhouse.md b/website/blog/en/2016/yandex-opensources-clickhouse.md
deleted file mode 100644
index 16618824e5e..00000000000
--- a/website/blog/en/2016/yandex-opensources-clickhouse.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: 'Yandex Opensources ClickHouse'
-image: 'https://blog-images.clickhouse.com/en/2016/yandex-opensources-clickhouse/main.jpg'
-date: '2016-06-15'
-tags: ['announcement', 'GitHub', 'license']
-author: 'Alexey Milovidov'
----
-
-Today [analytical DBMS ClickHouse](https://clickhouse.com/) initially developed internally at Yandex, became available to everyone. Source code is published on [GitHub](https://github.com/ClickHouse/ClickHouse) under Apache 2.0 license.
-
-ClickHouse allows interactive analytical query execution on data updated in real time. System is able to scale to tens of trillions of rows and petabytes of stored data. Using ClickHouse opens up opportunities that were hard to imagine: you can store full stream of data and slice and dice it to produce reports without offline aggregation. ClickHouse was initially developed as a backend for [Yandex.Metrica](https://metrika.yandex.com/) — second largest web analytics system in the world.
-
-[Discussion on Hacker News](https://news.ycombinator.com/item?id=11908254).
diff --git a/website/blog/en/2017/clickhouse-at-data-scale-2017.md b/website/blog/en/2017/clickhouse-at-data-scale-2017.md
deleted file mode 100644
index e288d6e455d..00000000000
--- a/website/blog/en/2017/clickhouse-at-data-scale-2017.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: 'ClickHouse at Data@Scale 2017'
-image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-at-data-scale-2017/main.jpg'
-date: '2017-06-15'
-tags: ['conference', 'Seattle', 'USA', 'America', 'events']
-author: 'Alexey Milovidov'
----
-
-![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
-
-[Slides](https://presentations.clickhouse.com/data_at_scale/)
diff --git a/website/blog/en/2017/clickhouse-at-percona-live-2017.md b/website/blog/en/2017/clickhouse-at-percona-live-2017.md
deleted file mode 100644
index 12966ffa726..00000000000
--- a/website/blog/en/2017/clickhouse-at-percona-live-2017.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: 'ClickHouse at Percona Live 2017'
-image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/main.jpg'
-date: '2017-04-28'
-tags: ['meetup', 'Santa Clara', 'Bay Area', 'California', 'USA', 'America', 'events', 'Graphouse']
----
-
-For those who haven't heard, [Percona Live](https://percona.com/live/17) is probably one of the largest international conferences about opensource database management systems, having 12 talk tracks in parallel. It's been around for many years and initially, it was focused mainly on MySQL (and had that in its name), but nowadays it is more generic and other products of this category get lots of attention too. Needless to say that for a relatively new player on the market like [ClickHouse](https://clickhouse.com/), it's been a great opportunity to spread the word about the technology and how exactly it allows us to perform analytics on petabytes of data in real-time.
-
-![Percona Live](https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/1.jpg)
-
-Yandex team members had three chances to talk about ClickHouse from the stage:
-
-1. A large portion of [Opening Keynote](https://www.percona.com/blog/2017/04/25/percona-live-2017-day-one-keynotes/) has been dedicated to different time-series databases. ClickHouse is not really a specialized time-series database but still outperforms many alternatives if used as such. So Dmitry Andreev, Head of Yandex.Market Infrastructure Development Group, had a short talk about how ClickHouse can be used a as storage backend for Graphite using [Graphouse](https://github.com/clickhouse/graphouse), an open-source adapter that implements this. This setup is used in Yandex.Market and number of other Yandex services and have proven to be very reliable and effective. Chain of short talks has been followed by a live panel about time series in general with the same speakers including Dmitry. Unfortunately, as we figured out later, many keynote attendees perceived ClickHouse as just yet another time-series database and missed the explicitly said part that it opens up way more opportunities to analyze data.
-2. Victor Tarnavsky, Head of Yandex.Metrica, and Alexey Milovidov, Head of ClickHouse Development Group, gave a full-length talk about ClickHouse overview, capabilities, features and use cases. Their video has not been recorded, but you can check out [the slides](https://presentations.clickhouse.com/percona2017/ClickHouse%20Percona%20Santa%20Clara%202.0.pdf).
-3. Later on, Dmitry Andreev went deeper on the same topic he covered on an opening keynote. He spoke in more detail about how Graphouse works, shown the benchmark results and future plans of the project. Also, [only slides](https://www.percona.com/live/17/sites/default/files/slides/clickhouse-as-timeseries-database.pdf) are available.
-
-![Keynote](https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/2.gif)
-
-Besides, ClickHouse has been represented in the exhibition accompanying the conference. Altinity, the private company independent from Yandex that provides consulting and support services for ClickHouse, organized the booth and invited Yandex team members to join them to talk about ClickHouse with conference attendees which appeared to be quite productive.
-
-![ClickHouse Booth](https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/3.jpg)
diff --git a/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md b/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md
deleted file mode 100644
index b882cf81fa2..00000000000
--- a/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: 'ClickHouse Meetup in Berlin, October 5, 2017'
-image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-meetup-in-berlin-october-5-2017/main.jpg'
-date: '2017-10-19'
-tags: ['meetup', 'Berlin', 'Germany', 'events']
----
-
-![iframe](https://www.youtube.com/embed/videoseries?list=PL0Z2YDlm0b3hO_3kCUFZLdcIQuI3gghZ8)
-
-All presentations are available for download at [the event page](https://events.yandex.com/events/meetings/05-10-2017/).
diff --git a/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md b/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
deleted file mode 100644
index 832cf476b6a..00000000000
--- a/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'ClickHouse Meetup in Santa Clara on May 4, 2017'
-image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017/main.jpg'
-date: '2017-05-11'
-tags: ['meetup', 'Santa Clara', 'Bay Area', 'California', 'USA', 'America', 'events']
----
-
-After [Percona Live 2017](clickhouse-at-percona-live-2017.md), ClickHouse team stayed for one more week in San Francisco Bay Area to meet with local companies in person to talk about ClickHouse and how it can be applied to their tasks. On the last evening we even managed to organize our own meetup with active ClickHouse users in the area, not as large as we regularly host in Russia, but still had some very interesting discussions.
diff --git a/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md b/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md
deleted file mode 100644
index d9ba8890ad0..00000000000
--- a/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: 'Join the ClickHouse Meetup in Berlin'
-image: 'https://blog-images.clickhouse.com/en/2017/join-the-clickhouse-meetup-in-berlin/main.jpg'
-date: '2017-10-19'
-tags: ['announcement', 'meetup', 'Berlin', 'Germany', 'events']
----
-
-Come learn about ClickHouse, our open source high-performance column-oriented database management system at a meetup on October 5, 2017 at the Park Inn at Alexanderplatz 7 in Berlin.
-
-ClickHouse can generate custom data reports in real time and process billions of rows and dozens of gigabytes of data per single server per second. It works up to a thousand times faster than traditional approaches. ClickHouse is linearly scalable, hardware-efficient, fault-tolerant, and can be deployed across multiple data centers.  Among other features, ClickHouse offers a user-friendly SQL query dialect with a number of built-in analytics capabilities.
-
-Join us at the meetup to learn why hundreds of companies across Europe, US, and China are adopting ClickHouse. Through interactive talks, attendees will learn about product features, how ClickHouse can benefit them, and how to use this system in practice.
-Attending the ClickHouse meetup is free. [Please register to join us](https://events.yandex.com/events/meetings/05-10-2017/).
diff --git a/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md b/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md
deleted file mode 100644
index 421f03ae226..00000000000
--- a/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'Announcing ClickHouse Meetup in Amsterdam on November 15'
-image: 'https://blog-images.clickhouse.com/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15/main.jpg'
-date: '2018-10-17'
-tags: ['meetup', 'Amsterdam', 'Netherlands', 'events', 'announcement']
----
-
-Yet another meetup of ClickHouse community is planned in Europe, see detailed agenda and register on [the event page](https://events.yandex.com/events/meetings/15-11-2018/).
diff --git a/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md b/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md
deleted file mode 100644
index 6c111420497..00000000000
--- a/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: 'ClickHouse at Analysys A10 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/main.jpg'
-date: '2018-11-04'
-tags: ['conference', 'Beijing', 'China', 'events', 'Analysys', 'Asia']
----
-
-[Analysys A10](https://event.analysys.cn/pc/2018/index.html) is a large conference on Big Data that took place on October 26-27 in Beijing. Since China's population is huge, it generates a lot of data and Big Data industry is in very high demand. ClickHouse team has been honored to participate in this event alongside top management, analysts, and IT professionals from various Chinese companies.
-
-Each year Analysys also organizes the OLAP contest. The second year in a row the same team of Sundy Li (李本旺) and Winter Zhang (张健) wins it by using ClickHouse as the core of their solution. The task was to calculate complex marketing funnel as fast as possible.
-
-Sundy Li (李本旺) receives award for winning Analysys OLAP contest 2018 from William Kwok (郭炜):
-![Sundy Li and William Kwok](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/1.jpg)
-
-The first day of the conference we mostly spent talking with people on ClickHouse booth, while on the second day there were two technical talks about ClickHouse.
-
-Alexey Milovidov demonstrates ClickHouse and how it works internally:
-![Alexey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/2.jpg)
-
-Sundy Li (李本旺) explains the audience how they won the OLAP contest using ClickHouse:
-![Sundy Li](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/3.jpg)
-
-The next day after A10 was a dedicated ClickHouse Community Meetup in Beijing, but it deserves a separate recap post.
-
-Analysys A10 afterparty:
-![Analysys A10 afterparty](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/4.jpg)
-
diff --git a/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md b/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md
deleted file mode 100644
index 0fc8660c92c..00000000000
--- a/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: 'ClickHouse at Percona Live Europe 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/main.jpg'
-date: '2018-11-21'
-tags: ['conference', 'Frankfurt', 'Germany', 'events', 'Percona Live', 'Europe']
----
-
-Open-source database management systems conference [Percona Live](https://www.percona.com/live/e18/) this time took place on November 5-7 in Germany, Frankfurt am Main. Over last couple years ClickHouse became a solid member of this community as demand in analytics with subsecond latencies appeared to be pretty high.
-
-There were three talks about ClickHouse in agenda, while only one of them was from Yandex. Also we had a lot of interesting conversations with conference attendees at ClickHouse booth sponsored by Altinity.
-
-Alexander Zaitsev, CTO and co-founder of Altinity, gives an overview of ClickHouse and then demonstrates case studies and best practices ([slides](https://presentations.clickhouse.com/percona_europe_2018/Altinity.pdf)):
-![](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/1.jpg)
-
-Fast! Flexible! Free! Fun!
-![Fast! Flexible! Free! Fun!](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/2.jpg)
-
-Aleksey Milovidov, lead ClickHouse developer from Yandex, talks about unusual and unique ClickHouse features ([slides](https://presentations.clickhouse.com/percona_europe_2018)):
-![Aleksey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/3.jpg)
-
-Aleksandar Aleksandrov and Felix Mattrat, data engineers from MessageBird, show how they use ClickHouse to analyze process of delivery of SMS and other kinds of messages ([slides](http://presentations.clickhouse.com/percona_europe_2018/MessageBird.pdf)):
-![Aleksandar Aleksandrov and Felix Mattrat](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/4.jpg)
-
-Live demo at ClickHouse booth by Alexey Milovidov:
-![Demo at ClickHouse booth by Alexey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/5.jpg)
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md
deleted file mode 100644
index 63293f1ff67..00000000000
--- a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: 'ClickHouse Community Meetup in Beijing on January 27, 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/main.jpg'
-date: '2018-02-08'
-tags: ['meetup', 'Beijing', 'China', 'events', 'Asia']
----
-
-Last year there has been an OLAP algorithm contest in China organized by Analysys. The team who have shown the top results and won the competition has been using ClickHouse as the core of their solution. Other teams were mostly using different technologies and didn't really know much about ClickHouse at a time. When the final results were published, many people in China who participated in or were aware of this competition became really eager to learn more about ClickHouse. This spike of interest about ClickHouse in China has eventually lead to the first Chinese ClickHouse Community Meetup that has taken place in Beijing.
-
-Welcome word by William Kwok, CTO of Analysys, who personally played a huge role in making this event possible:
-![William Kwok, CTO of Analysys](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/1.jpg)
-
-It was probably the most intense ClickHouse Meetup compared to all previous ones worldwide. The main part of the event took over 6 hours non-stop and there were also either pre-meetup and after-party on the same day. Well over 150 people have shown up on Saturday to participate.
-
-Audience listening for ClickHouse introduction by Alexey Milovidov:
-![ClickHouse introduction by Alexey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/2.jpg)
-
-Alexey Milovidov has started the main meetup session with an introductory talk about ClickHouse, it's usage inside Yandex and history that lead to becoming an open-source analytical DBMS ([slides](https://presentations.clickhouse.com/meetup12/introduction/)).
-
-Alexander Zaitsev's practical talk about migrating to ClickHouse:
-![Alexander Zaitsev](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/3.jpg)
-
-Alexander Zaitsev has shared his vast experience in migrating to ClickHouse. LifeStreet, advertisement company where he works, was one of the first companies outside of Yandex which switched to ClickHouse from other analytical DBMS in production. Later on, Alexander also co-founded Altinity, a company that specializes in helping others to migrate to ClickHouse and then effectively use it to achieve their business goals. The talk has covered many specific topics that are important for those who are in the middle of such migration or just considering it ([Slides](https://presentations.clickhouse.com/meetup12/migration.pptx)).
-
-Alexey Zatelepin explaining how ClickHouse sparse index works and other implementation details:
-![Alexey Zatelepin](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/4.jpg)
-
-Alexey Zatelepin's technical talk was focused on providing engineers some insights on why ClickHouse is that fast in OLAP workloads and how to leverage its design and core features as a primary index, replication, and distributed tables to achieve great performance and reliability ([slides](https://presentations.clickhouse.com/meetup12/internals.pdf)).
-
-Jack Gao gives an extensive overview of ClickHouse and it's use cases in Chinese:
-![Jack Gao](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/5.jpg)
-
-As we have learned during meet up and the rest of our business trip, actually there are many companies in China that are already using or seriously evaluating ClickHouse to use either part of their products or for internal analytics. Three of them are doing this long and extensively enough to give a full talk about their progress and experience.
-
-In China, in general, and especially in Beijing the knowledge of English is not really common. Chinese people working in the IT industry have to know English well enough to read documentation, but it does not really imply that they can talk or understand verbal English well. So the talks by representatives of local companies were in Chinese.
-
-Jack Gao, ex-DBA and now an analyst at Sina (major social network) have dedicated a significant part of his talk to go over fundamental topics essential to most ClickHouse users. It partially overlapped with previous talks, but this time in Chinese. Also, he covered not only use case of ClickHouse in Sina but also other publicly known cases by other companies. Considering the reaction of the audience, it has been the most useful talk of the whole meetup, because of the widely useful content, lack of language barrier, and excellent execution of presentation. We even had to sacrifice initially scheduled a short break to give Jack some additional time ([slides](https://presentations.clickhouse.com/meetup12/power_your_data.pdf)).
-
-Yang Xujun from Dataliance / UltraPower, which provides outsourced data analysis platform to telecom companies in China, have demonstrated why they decided to move away from reports prepared offline in Apache Hadoop / Spark and exported to MySQL towards ClickHouse. In short: Hadoop is too slow and cumbersome ([slides](https://presentations.clickhouse.com/meetup12/telecom.pdf)).
-
-It might sound obvious, but the huge Chinese population generates insane amounts of data to store and process. So IT companies operating mostly on the local Chinese market are often handling amounts of information comparable to even the largest global companies.
-
-Kent Wang from Splunk Shanghai R&D center has demonstrated the current state of ClickHouse integration into Splunk ecosystem. Basically, they have plugged ClickHouse into their system via JDBC driver to allow data from ClickHouse to be easily accessed in Splunk UI and dashboards. Last spring ClickHouse team actually had a friendly visit to Splunk office in San Francisco to discuss potential points of interaction and exchange experience, so it was great to hear that there's some real progress in that direction ([slides](https://presentations.clickhouse.com/meetup12/splunk.pdf)).
-
-The last talk was for the most tenacious ClickHouse users. Alexey Milovidov has announced some recently released features and improvements and shared what's coming next either in the short and long term [slides](https://presentations.clickhouse.com/meetup12/news_and_plans/).
-
-Here is an over 5 hours long video recording of main meetup session:
-
-![iframe](https://www.youtube.com/embed/UXw8izZGPGk)
-
-If you are from China or at least can read Chinese, you might consider joining the **[Chinese ClickHouse User Group](http://www.clickhouse.com.cn/)**.
-
-{## Likely outdated in favor of YouTube
-
-There is an over 5 hours long video recording of main meetup session, but it'll take a bit of effort to get access to it (especially if you are not from China): http://m.zm518.cn/zhangmen/livenumber/share/entry/?liveId=1460023&sharerId=6fd3bac16125e71d69-899&circleId=b0b78915b2edbfe6c-78f7&followerId=&timestamp=1517022274560
-You'll need to install WeChat (probably one of the most popular messengers in the world, everyone in China has it) on your smartphone: Android or iOS. https://play.google.com/store/apps/details?id=com.tencent.mm https://itunes.apple.com/ru/app/wechat/id414478124?mt=8
-On the first launch, WeChat will ask to confirm your phone number via SMS, read some digits via a microphone and accept the user agreement. Go through this.
-On your computer, click the red button in the middle of the video behind the link above. It'll show a QR code. Now in WeChat in the top-right corner, there's the “+” button which opens a menu that has a “Scan QR code” item. Use it to scan QR code from your computer screen, then press the “Sign in” button on the smartphone. Now the video on the computer automatically becomes playable.
-If you are from China or at least can read Chinese, you might consider joining the Chinese ClickHouse User Group.
-
-ClickHouse Community Meetup afterparty.
-##}
-
-Pre-meetup meeting of speakers and most active ClickHouse users in China:
-![Pre-meetup meeting](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/6.jpg)
-
-ClickHouse Community Meetup afterparty:
-![ClickHouse Community Meetup afterparty](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/7.jpg)
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md
deleted file mode 100644
index 5934e34cb25..00000000000
--- a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: 'ClickHouse Community Meetup in Beijing on October 28, 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/main.jpg'
-date: '2018-11-12'
-tags: ['meetup', 'Beijing', 'China', 'Asia', 'events']
----
-
-Interest in ClickHouse among Chinese experts is growing rapidly. It was second ClickHouse Meetup in Beijing this year and the venue was more than full, it could fit only about 170 people out of 500 who signed up and around 2000 more joined the live translation online. Many Chinese companies have already adopted ClickHouse in production and are willing to share their experience.
-
-See the **[video recording of all talks](http://play.yunxi.tv/livestream/flash?id=05527cf6e260448b9d880b99d2cf4d40)** and **[all slides](https://github.com/ClickHouse/clickhouse-presentations/tree/master/meetup19)**.
-
-Welcome word by William Kwok (郭炜), CTO of Analysys, who played a key role in organizing this event:
-![William Kwok](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/1.jpg)
-
-Nikolay Kochetov from Yandex demonstrating recent advancements in string processing optimization using LowCardinality feature:
-![Nikolay Kochetov from Yandex](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/2.jpg)
-
-Shang Shujie (尚书杰) from Kuaishou gives an overview of ClickHouse and it's usage scenarios:
-![Shang Shujie](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/3.jpg)
-
-Winter Zhang (张健) from QingCloud explains their services based on ClickHouse:
-![Winter Zhang](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/4.jpg)
-
-Audience listening to Zhang's talk:
-![Audience listening to Zhang's talk](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/5.jpg)
-
-Li Junfei (李俊飞) from Tencent explains how ClickHouse fits their data processing infrastructure:
-![Li Junfei](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/6.jpg)
-
-Questions&Answers session:
-![Q&A](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/7.jpg)
-
-Jack Gao (高鹏) from Sina explains their ClickHouse use case and gives some advice based on their extensive experience with ClickHouse:
-![Jack Gao](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/8.jpg)
-
-Chinese developers are also one of the most active worldwide in contributing to ClickHouse source code compared to other countries. Chinese ClickHouse Contributors Awards 2018 ceremony was also part of the meetup agenda with the following:
-
-1. 张建 (Winter Zhang, zhang2014) received First Place among independent ClickHouse developers in China for 2018, having developed 22 new features, improvements, and fixes in 57 pull requests.
-2. Amos Bird received Second Place among independent ClickHouse developers in China for 2018, having developed 16 new features, improvements, and fixes in 42 pull requests.
-3. 李本旺 (sundy-li) received Third Place among independent ClickHouse developers in China for 2018, having developed 6 new features, improvements, and fixes in 11 pull requests.
-
-A special award went to William Kwok (郭炜) for his active role in developing the Chinese ClickHouse Community.
-
-Sundy Li (李本旺) receives ClickHouse Contributor Award from Alexey Milovidov:
-![Sundy Li](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/9.jpg)
-
-William Kwok (郭炜) receives special award for organizing Chinese ClickHouse community and meetups:
-![William Kwok](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/10.jpg)
-
-Pre-meetup at the Analysys office:
-![Pre-meetup](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/11.jpg)
-
-
-
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md
deleted file mode 100644
index 2f86859c3f9..00000000000
--- a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: 'ClickHouse Community Meetup in Berlin on July 3, 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/main.jpg'
-date: '2018-07-05'
-tags: ['meetup', 'Berlin', 'Germany', 'events']
----
-
-Just a few months ago Brenno Oliveira from Delivery Hero has dropped us an email saying that they want to host a meetup of ClickHouse community in their HQ and together we made it happen. Actually, renting a suitable room is one of the main limiting factors on how often ClickHouse meetups can happen worldwide and it was very kind of Delivery Hero to provide it for free. Bringing interesting speakers was the easy part as there are more and more companies adopting ClickHouse and willing to share their stories. Being an open-source product has its advantages after all. About 50 people have shown up from 75 sign-ups, which is way above the typical rate.
-
-To get started Alexander Zaitsev from Altinity gave an overview of ClickHouse for those who are not that familiar with the technology yet. He was using use cases from his personal experience and their clients as examples. Here are [the slides](https://presentations.clickhouse.com/meetup16/introduction.pdf), unfortunately, no video this time.
-
-Gleb Kanterov talking about the usage of ClickHouse for experimentation metrics at Spotify:
-![Gleb Kanterov Spotify](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/1.jpg)
-
-![Gleb Kanterov Spotify](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/2.jpg)
-
-Spotify relies heavily on what Google Cloud Platform provides, but nevertheless found a spot in their infrastructure where only ClickHouse appeared to satisfy the requirements. Gleb Kanterov has demonstrated their approach to conducting experiments and measuring if they are worth being promoted to production solutions. Using ClickHouse has allowed them to build a framework scalable to thousands of metrics, which in the end makes them move even faster and break fewer things. Checking out [full slides](https://presentations.clickhouse.com/meetup16/spotify.pdf) is highly recommended and here are a few quotes:
-
--   **Requirements**
-    - Serve 100-s of QPS with sub-second latency
-    - We know in advance what are queries and data
-    - Maintain 10x metrics with the same cost
-    - Thousands of metrics
-    - Billions of rows per day in each of 100-s of tables
-    - Ready to be used out of the box
-    - Leverage existing infrastructure as much as feasible
-    - Hide unnecessary complexity from internal users
--   **Why ClickHouse?**
-    - Build proof of concept using various OLAP storages (ClickHouse, Druid, Pinot,...)
-    - ClickHouse has the most simple architecture
-    - Powerful SQL dialect close to Standard SQL
-    - A comprehensive set of built-in functions and aggregators
-    - Was ready to be used out of the box
-    - Superset integration is great
-    - Easy to query using clickhouse-jdbc and jooq
-
-The last talk by Alexey Milovidov was pretty technical and mostly intended for a deeper understanding of what's going on inside ClickHouse, see [the slides](https://presentations.clickhouse.com/meetup16/internals.pdf). There were many experienced users in the audience who didn't mind staying late to hear that and ask very relevant questions. Actually, we had to leave the building way before people were out of topics to discuss.
-
-If your company regularly hosts technical meetups and you are looking for interesting topics to talk about, ClickHouse might be in pretty high demand. Feel free to write ClickHouse team via [this form](http://clickhouse.com/#meet) if you are interested to host a similar event in your city and we'll find a way to cooperate and bring in other ClickHouse community members.
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md b/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md
deleted file mode 100644
index beb06f1f3d4..00000000000
--- a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'Announcing ClickHouse Community Meetup in Berlin on July 3'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3/main.jpg'
-date: '2018-06-25'
-tags: ['meetup', 'Berlin', 'Germany', 'events', 'announcement']
----
-
-There's yet another upcoming meetup of ClickHouse community in Europe, see detailed agenda and sign up on [the event page](https://bitly.com/2Jv9Bug).
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md
deleted file mode 100644
index f94d2de411c..00000000000
--- a/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: 'ClickHouse Community Meetup in Paris on October 2, 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/main.jpg'
-date: '2018-10-09'
-tags: ['meetup', 'Paris', 'France', 'events']
----
-
-Agenda of Paris ClickHouse Meetup was full of use cases, mostly from France-based companies which are actively using ClickHouse. Slides for all talks are [available on the GitHub](https://github.com/clickhouse/clickhouse-presentations/tree/master/meetup18).
-
-Christophe Kalenzaga and Vianney Foucault, engineers from Contentsquare, company that provided the meetup venue:
-![Christophe Kalenzaga and Vianney Foucault](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/1.jpg)
-
-Matthieu Jacquet from Storetail (Criteo):
-![Matthieu Jacquet](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/2.jpg)
-
-The audience:
-![Audience](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/3.jpg)
-
-Networking after the meetup:
-![Networking](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/4.jpg)
diff --git a/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md b/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md
deleted file mode 100644
index ad408d51658..00000000000
--- a/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: 'ClickHouse Meetup in Amsterdam on November 15, 2018'
-image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/main.jpg'
-date: '2018-11-22'
-tags: ['meetup', 'Amsterdam', 'Netherlands', 'events']
----
-
-20th ClickHouse Meetup took place in Amsterdam, which appeared to be a convenient location for people from all over Europe to join the event, including Austria, Czech Republic and Germany. We were also glad to see people from many local companies including Booking.com, Crobox, Marktplaats (eBay), MessageBird and others.
-
-Aleksandar Aleksandrov and Felix Mattrat, data engineers from MessageBird, show how they use ClickHouse to analyze process of delivery of SMS and other kinds of messages:
-![Aleksandar Aleksandrov and Felix Mattrat](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/1.jpg)
-
-Nikolay Kochetov from ClickHouse team demonstrates recent features related to string processing optimization:
-![Nikolay Kochetov from ClickHouse team](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/2.jpg)
-
-Konstantin Ignatov from Qrator Labs shares his experience in using ClickHouse as time-series database:
-![Konstantin Ignatov from Qrator Labs](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/3.jpg)
-
-Aurimas Jacikevicius from Altinity demonstrates benchmark of ClickHouse against TimescaleDB and InfluxDB under time-series workload:
-![Aurimas Jacikevicius from Altinity](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/4.jpg)
-
-Roy Brondgeest from Crobox showcases [ClickHouse Scala reactive client](https://github.com/crobox/clickhouse-scala-client) and it's bundled [DSL for query building](https://github.com/crobox/clickhouse-scala-client/wiki):
-![Roy Brondgeest from Crobox](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/5.jpg)
-
-Alexey Milovidov from Yandex closes the meetup with talk about performance analysis of ClickHouse queries:
-![Alexey Milovidov from Yandex](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/6.jpg)
-
diff --git a/website/blog/en/2018/concept-cloud-mergetree-tables.md b/website/blog/en/2018/concept-cloud-mergetree-tables.md
deleted file mode 100644
index 4d19a3299b3..00000000000
--- a/website/blog/en/2018/concept-cloud-mergetree-tables.md
+++ /dev/null
@@ -1,120 +0,0 @@
----
-title: 'Concept: "Cloud" MergeTree Tables'
-image: 'https://blog-images.clickhouse.com/en/2018/concept-cloud-mergetree-tables/main.jpg'
-date: '2018-11-23'
-tags: ['concept', 'MergeTree', 'future', 'sharding']
----
-
-The main property of the MergeTree cloud tables is the absence of manual control over the sharding scheme of data on a cluster. The data in the cloud tables are distributed around the cluster on its own, while at the same time providing the locality property for a certain key.
-
-## Requirements
-
-1. Creating a cloud table makes it visible on all nodes of the cluster. No need to manually create a separate Distributed table and local tables on each node.
-2. When ingesting data to a cloud table, while the table is very small, data is distributed across several cluster servers, but as data grows, more servers are involved (for example, starting from gigabytes per server). The user can create a small table and it should not be too cumbersome; but when creating a table, we do not know in advance how much data will be loaded into it.
-3. The user specifies a sharding key (arbitrary tuple). Data for the sharding key range (in lexicographical order) is located on some servers. Very small ranges are located on several servers and to access it is enough to read data from a single server, while sufficiently large ranges are spread across all servers. For example, if we are talking about web analytics the sharding key might start with CounterID, the website identifier. Data on a large site like https://yandex.ru should be spread across all servers in the cluster, while data on a small site should be located on only a few servers. Physical explanation: the cluster should scale to simultaneously provide throughput for heavy queries and to handle high QPS of light queries, and for light queries, the latency should not suffer. In general, this is called data locality.
-4. The ability for heavy queries to use all the servers in the cluster, rather than 1 / N, where N is the replication coefficient. Thus, one server can contain multiple replicas of different shards.
-5. When replacing the server with an empty one (node recovery), the data restore must be parallelized in some way. At least the reads should be spread over different servers to avoid overloading individual servers.
-6. On each local server, reading the range of the primary key should be touching not a very large number of file ranges or not too small file ranges (minimizing disk seeks).
-7. (Optional) The ability to use individual disks instead of RAID, but at the same time preserving throughput when reading medium-sized primary key ranges and preserving QPS when reading small-sized ranges.
-8. The ability to create multiple tables with a common sharding scheme (co-sharding).
-9. Rebalancing data when adding new servers; creation of additional replicas with long unavailability of old servers.
-10. SELECT queries should not require synchronous requests to the coordinator. No duplicates or missing data visible by SELECT queries during data rebalancing operations.
-11. SELECT queries must choose large enough subset of servers considering conditions on sharding key and knowledge of the current sharding scheme.
-12. The ability to efficiently distribute data across servers with uneven available disk space.
-13. Atomicity of INSERT on a cluster.
-
-Out of scope and will not be considered:
-
-1. Erasure data encoding for replication and recovery.
-2. Data storage on systems with different disks - HDD and SSD. An example is storing fresh data on an SSD.
-
-## General Considerations
-
-A similar problem usually (in Map-Reduce or blob-storage systems) is solved by organizing data in chunks. Chunks are located on the nodes of the cluster. Mappings: table or file -> chunks, chunk -> nodes, are stored in the master, which itself can be replicated. The master observes the liveliness of nodes and maintains a reasonable replication level of all chunks.
-
-Difficulties arise when there are too many chunks: in this case, the master does not cope with the storage of metadata and with the load. It becomes necessary to make complicated metadata sharding.
-
-In our case, it may seem tempting to solve a problem in a similar way, where instead of a chunk, an instance of a MergeTree type table containing the data range is used. Chunks in other systems are called “tablets” or “regions”. But there are many problems with this. The number of chunks on one server cannot be large, because then the property is violated - minimizing the number of seeks when reading data ranges. The problem also arises from the fact that each MergeTree table itself is rather cumbersome and consists of a large number of files. On the other hand, tables with a size of one terabyte are more or less normal if the data locality property is maintained. That is if several such tables on one server begin to be used only for not too small data ranges.
-
-A variety of options can be used for sharding data, including:
-Sharding according to some formula with a small number of parameters. Examples are simple hashing, consistent hashing (hash ring, rendezvous hashing, jump consistent hashing, sumbur). The practice of using in other systems shows that in its pure form this approach does not work well, because the sharding scheme is poorly controlled. Fits fine, for example, for caches. It can also be used as part of another algorithm.
-
-The opposite option is that the data is divided into shards using an explicitly specified table. The table may contain key ranges (or, in another case, hash ranges from keys) and their corresponding servers. This gives a much greater degree of freedom in choosing when and how to transfer data. But at the same time, to scale the cluster, the size of the table has to be dynamically expanded, breaking the existing ranges.
-
-One of the combined options is that the mapping is made up of two parts: first, the set of various keys is divided into some pre-fixed not too few and not too many “virtual shards” (you can also call “logical shards”, “mini-shards”). This number is several times larger than the hypothetical cluster size in the number of servers. Further, the second mapping explicitly specifies the location of each mini-shard on the servers, and this second mapping can be controlled arbitrarily.
-
-The complexity of this approach is that partitioning hash ranges gives uniformity, but does not give locality of data for range queries; whereas when splitting by key ranges, it is difficult to choose a uniform distribution in advance since we do not know what the distribution of data will be to the keys. That is, the approach with the choice of a pre-fixed split into mini-shards does not work if data locality is required.
-
-It turns out that the only acceptable approach in our case is partitioning by key ranges, which can change dynamically (repartitioned). At the same time, for more convenience, manageability, and uniformity of data distribution, the number of partitioning elements can be slightly larger than the number of servers, and the mapping from the partitioning element into servers can be changed separately.
-
-## Possible Implementation
-
-Each ClickHouse server can participate in a certain cloud. The cloud is identified by a text string. The membership of a node in the cloud can be ensured by creating a certain type of database on the node (IDatabase). Thus, one node can be registered in several clouds. Registry of the nodes registered in the cloud is maintained in the coordinator.
-
-Cloud nodes are selected to accommodate the replicas of the shards of cloud tables. The node also sends some additional information to the coordinator for its selection when placing data: the path that determines the locality in the network (for example, data center and rack), the amount of disk space, etc.
-
-The cloud table is created in the corresponding database registered in the cloud. The table is created on any server and is visible in all databases registered in the cloud.
-
-Sharding key is set for cloud table on it“s creation, an arbitrary tuple. Sometimes it is practical that the sharding key matches the primary key (example - (CounterID, Date, UserID)), sometimes it makes sense that it is different (for example, the DateTime primary key, sharding key - UserID).
-
-Sharding is a composition of several mappings:
-
-1. The set of all possible tuples, the values ​​of the sharding key, is mapped onto many half-intervals that break the half-interval [0, 1). Initially, this number is the size of the partition, it is equal to 1. That is, all values ​​are mapped into a single semi-interval, the whole set [0, 1). Then, as the amount of data in the table increases, the semi-intervals, the split elements, can be divided approximately in half by the median of the distribution of values ​​in lexicographical order.
-2. For each half-interval splitting, several cloud servers are selected and remembered in some way, on which replicas of the corresponding data will be located. The choice is made based on the location of servers on the network (for example, at least two replicas in different data centers and all replicas in different racks), the number of replicas already created on this server (choose servers with the minimum) and the amount of free space (from various servers just select the server with the maximum amount of free space).
-
-As a result, this composition forms a mapping from the sharding key into several replica servers.
-
-It is assumed that in the course of work both parts of this mapping may change.
-
-The result of mapping 1 can be called the “virtual shard” or “logical shard”. In the process of work, virtual shards can be divided in half. Going in the opposite direction is impossible - the number of virtual shards can only grow. It is assumed that even for tables occupying the entire cluster, the number of virtual shards will be several times larger than the number of servers (for example, it may be greater by 10 times the replication ratio). Data ranges occupying at least a tenth of all data should be spread across all servers to ensure throughput of heavy queries. The mapping as a whole is specified by the set of boundary values ​​for the sharding key. This set is small (roughly kilobytes) and stored in the coordinator.
-
-The mapping of virtual shards on real servers can change arbitrarily: the number of replicas can increase when servers are not available for a long time or increase and then decrease to move replicas between servers.
-## How to Satisfy All Requirements
-
-List items below correspond to the requirement numbers above:
-
-1. IDatabase synchronously goes to the coordinator to get or change the list of tables. The list of cloud tables is stored in the coordinator in the node corresponding to the cloud. That is, all the tables in the cloud are visible on each server entering the cloud.
-2. It is ensured by the fact that initially the partition consists of a single element, but begins to break up further with increasing data volume. Each replica responsible for the local storage of this data can initiate the splitting, once the criterion for the data volume has been reached. Multiple replicas may decide to do this competitively, and the decision is made using atomic CAS. To have fewer problems, it is possible to randomize somewhat the moment of deciding repartition. The criterion when it is necessary to additionally break virtual shards turns out to be non-trivial. For example, you can break up to the number of servers * the replication rate quite soon, by growing a shard to several gigabytes. But it is already worth breaking shards even when shards are 1 / N in size from the server size (for example, around a terabyte). In coordinator, you should store the last and previous splits immediately and do not do the splitting too often.
-3. It is ensured by the fact that the number of virtual shards will be several times (user-defined) more than the number of servers. Note: for additional data spreading, you can impose some spreading transformation on the sharding key. Not thought out. For example, instead of a key (CounterID, Date, UserID) use for sharding (hash (UserID)% 10, CounterID, Date, UserID). But in this case, even small CounterIDs will fall into 10 ranges.
-4. Similarly.
-5. If several virtual shards are located on a single server, their replicas will be spread over a larger number of servers, and during recovery, there will be more fanout.
-6. Small requests will use one shard. While large requests will use several shards on the same server. But since each shard will be somewhat smaller, the data in the MergeTree table will probably be presented by a smaller set of parts. For example, we now have a maximum part size of 150 GiB, and for large tables, many such large chunks are formed in one partition. And if there are several tables, there will be a smaller number of large chunks in each. On the other hand, when inserting data, a larger number of small pieces will be generated on each server. And these small parts will cause an increase in the number of seeks. But not much, as the fresh data will be in the page cache. That is why too many virtual shards per server might not work well.
-7. Pretty hard. You can have groups of neighboring shards on different disks of the same server. But then reading of medium size ranges will not be parallelized (since the whole range will be on one disk). In RAID, the problem is solved by the fact that the size of the chunk is relatively small (typically 1 megabyte). It would be possible to come up with a separate distribution of data in different pieces on different disks. But it is too difficult to design and implement carefully. Probably it“s better not to do the whole thing, and as a minimum, make it so that when on the JBOD server, one server disk is selected for the location of one shard.
-8. It is possible to identify the sharding scheme with a string, which may be common to different tables. The criterion for splitting shards is determined based on the total amount of data for all tables with the same sharding scheme.
-9. It is solved completely by changing the mapping of virtual shards on the servers. This mapping can be controlled independently of everything else.
-10. Servers can cache the sharding map (both parts of it) for a while and update it usually asynchronously. When rebalancing data due to the splitting of virtual shards, you should keep the old data for a longer time. Similarly, when transferring replicas between servers. Upon request, the initiator server also asks if the remote server has the necessary data: data for the required shard according to the sharding scheme that is cached by the initiator server. For the query, one live replica of each shard is selected, on which there is data. If suddenly there were none, then it is worthwhile to update the sharding map synchronously, as for some reason all the replicas were transferred somewhere.
-11. It is trivial.
-12. It is solved on the basis that more than one shard accounts for one server and the fact that the distribution of shards replicas among servers is more or less arbitrary and can take into account the amount of disk space.
-## Issues
-
-To ingest data into a table, you can send an INSERT query to any server. The data will be divided into ranges and recorded on the desired servers. At the same time, it is synchronously ensured that we use a fresh sharding map - it is requested before the data is inserted and it is checked that it is not out of date, simultaneously with the commit in ZK.
-
-When a SELECT query is used, if the old sharding map was used, the latest data will not be visible. Therefore, the asynchronous update interval of the sharding map for SELECT should be made customizable, and an option should be added to synchronously use the latest sharding map.
-
-For fairly large tables, it turns out that an INSERT request breaks the data into many small pieces and writes to all servers (example: with 500 servers, you need to commit 5000 replicas of shards). This should work since the probability of inaccessibility or inhibition of all replicas of one shard is still low. But it will work slowly and, possibly, unstable. With a lot of INSERTs, there will be a terrible load on the coordinator. Although it can withstand one INSERT per second normally. To achieve high throughput of INSERTs, it is sufficient to simply make them parallel, but with the same low frequency of INSERTs in general. However, this is still a big problem.
-
-There are the following possible solutions:
-
-1. You can add something to the beginning of the sharding key. For example, Date % 10 or toMinute. Then INSERTs will touch fewer shards (in the typical case when recent data is inserted), but at the same time during some time intervals, some shards will be hotter than others. Normally, if it reduces the number of active shards, for example, from 5000 on INSERT to 500. It is also very inconvenient for users.
-2. You can come up with some kind of incomprehensible sharding scheme, where the fresh data first falls into some fresh shard where it is not clear where from where it is then lazily overwritten. A fresh shard is essentially a distributed queue. At the same time, a fresh shard with SELECT is always requested. Not so good. And still, it contradicts the atomicity of these transfers of data, visible at SELECT. Alternatively, you could relax the requirements if you allow SELECT not to see some of the fresh data.
-It looks like it“s generally not working well at a cluster size of over 500 servers.
-Another problem is that to properly spread the ranges of the primary key, the number of virtual shards must be no less than the number of servers squared. And this is too much.
-How to Get Around These Issues
-For sharding, you can add some more intermediate mappings. There are the following options:
-1. Splitting each shard into a set of shards in an arbitrary way. For example, 10 pieces. This is equivalent to adding a random number 0.N-1 to the beginning of the sharding key, which means nothing. Then with INSERT, you can only insert into one randomly selected shard, or a minimum sized shard, or some kind of round-robin; and as a result, INSERT becomes easier. But this increases the fanout of all point SELECTs. For convenience, such a partition can be done dynamically - only large enough shards can be divided in such a way (this will help avoid excessive splitting of old shards in the case when the sharding key starts with Date and the data is inserted in the Date order) or do such a partition starting from the situation when the number of shards is large enough (restriction on top of fanout INSERT requests).
-An additional advantage: in the case of servers with JBOD, it is possible to prefer to place such second-level shards on the disks of one server, which half emulates RAID-0.
-But there is a serious drawback: there is no possibility to do local IN / JOIN. For example, this possibility is assumed if the sharding key is hash (UserID), and we do JOIN by UserID. It would be possible to avoid this drawback by always placing all the “symmetric” shards on one server.
-2. A mapping that spreads the data while keeping the number of virtual shards. The essence of this mapping is as follows:
-    - The spreading factor is set, for example, `N = 10.` As the very first mapping, 10 times more ranges are generated. For example, if we want to end up with 7 shards, then we divide the data into 70 ranges.
-    - Then these ranges are renumbered in a circle with numbers from 0.6 and the ranges with the same number will fall into one shard, as a result, there will be 7 shards again.
-    - The continuous analogue of this mapping: `x in [0, 1) -> fractional_part (x * N)`, multiplication by N on a circle.
-
-If you draw it on the picture in Cartesian coordinates, you get a “saw” with 10 teeth.
-
-After this, it becomes obvious that this mapping simultaneously spreads the data and preserves its locality.
-
-See also: [Arnold's cat map](https://en.wikipedia.org/wiki/Arnold%27s_cat_map).
-
-But what is described here does not exactly work. First, until a sufficient amount of data has been accumulated, it is impossible to create a uniform division into parts (there is no place to count quantiles). Secondly, according to such a simple scheme, it is impossible to divide the intervals.
-
-There is an option in which, instead of dividing a range in half, it uses splitting into 4 parts, which are then mapped into two shards. It is also not clear how this will work.
diff --git a/website/blog/en/2019/clickhouse-at-percona-live-2019.md b/website/blog/en/2019/clickhouse-at-percona-live-2019.md
deleted file mode 100644
index 37beb163f1d..00000000000
--- a/website/blog/en/2019/clickhouse-at-percona-live-2019.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: 'ClickHouse at Percona Live 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/main.jpg'
-date: '2019-06-04'
-tags: ['Percona Live','USA','Texas','Austin', 'events', 'conference']
----
-
-This year American episode of [Percona Live](https://www.percona.com/live/19/) took place in nice waterfront location in Austin, TX, which welcomed open source database experts with pretty hot weather. ClickHouse community is undeniably growing and it became a common database product to give a talk about or at least compare or refer to, while just [two short years ago](../2017/clickhouse-at-percona-live-2017.md) it was more like “wth is ClickHouse?”.
-
-Alexey Rubin from VirtualHealth compared two column-oriented databases: ClickHouse and MariaDB Column Store. Bottom line was no surprise, ClickHouse is noticeably faster and MariaDB is more familiar for MySQL users, details were useful though.
-![Alexey Rubin from VirtualHealth](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/1.jpg)
-
-Alexey Milovidov from Yandex have demonstrated how exactly ClickHouse became even faster in recent releases.
-![Alexey Milovidov from Yandex](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/2.jpg)
-
-Alexander Zaitsev and Robert Hodges from Altinity have given an entry level tutorial to ClickHouse, which included loading in demo dataset and going through realistic queries against it with some extra variation demonstrating possible query optimization techniques. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Making%20HTAP%20Real%20with%20TiFlash%20--%20A%20TiDB%20Native%20Columnar%20Extension%20-%20FileId%20-%20174070.pdf). Also Altinity was sponsoring the ClickHouse booth in Expo Hall which became an easy spot for people interested in ClickHouse to chat outside of talks.
-![Alexander Zaitsev and Robert Hodges from Altinity](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/3.jpg)
-
-Ruoxi Sun from PingCAP introduced TiFlash, column-oriented add-on to TiDB for analytics based on ClickHouse source code. Basically it provides [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree/)-like table engine that is hooked up to TiDB replication and has in-memory row-friendly cache for recent updates. Unfortunately, PingCAP has no plans  to bring TiFlash to opensource at the moment. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Making%20HTAP%20Real%20with%20TiFlash%20--%20A%20TiDB%20Native%20Columnar%20Extension%20-%20FileId%20-%20174070.pdf).
-![Ruoxi Sun from PingCAP](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/4.jpg)
-
-ClickHouse has also been covered in talk by Jervin Real and Francisco Bordenave from Percona with overview of moving and replicating data around MySQL-compatible storage solutions. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Replicating%20MySQL%20Data%20to%20TiDB%20For%20Real-Time%20Analytics%20-%20FileId%20-%20187672.pdf).
-![Jervin Real](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/5.jpg)
-
-ClickHouse represented columnar storage systems in venture beyond relational by Marcos Albe from Percona.
-![Marcos Albe from Percona](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/6.jpg)
-
-Jervin Real from Percona have demonstrated real case study of applying ClickHouse in practice. It heavily involved manual partitions manipulation, hopefully audience have understood that it is an option, but not exactly a best practice for most use cases. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Low%20Cost%20Transactional%20and%20Analytics%20With%20MySQL%20and%20Clickhouse,%20Have%20Your%20Cake%20and%20Eat%20It%20Too!%20-%20FileId%20-%20187674.pdf).
-![Jervin Real from Percona](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/7.jpg)
-
-Evgeny Potapov from ITSumma went through modern options for time-series storage and once more confirmed ClickHouse is leading the way in this field as well.
-![Evgeny Potapov from ITSumma](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/8.jpg)
-
-Event location in the center of US provided equal opportunities for peoplefrom East and West Coast to show up, but presence of people from other countries was also quite noticeable. The content they all brought in was top notch as usual.
-![The venue](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/9.jpg)
-
-Austin after the Event.
-![Austin](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/10.jpg)
diff --git a/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md b/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md
deleted file mode 100644
index f9a156fa54b..00000000000
--- a/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: 'ClickHouse Lecture at Institute of Computing Technology, Chinese Academy of Science on June 11, 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019/main.jpg'
-tags: ['lecture', 'events', 'China', 'Beijing', 'university', 'academy', 'institute']
-date: '2019-06-14'
----
-
-Alexey Milovidov, head of ClickHouse development group at Yandex, have given an open two-part lecture at [Institute of Computing Technology, Chinese Academy of Science](http://english.ict.cas.cn/):
-
--   ClickHouse history and evolution of Yandex.Metrica storage system
--   Internal implementation of ClickHouse and reasoning behind design decisions
-
-The event has been organised by [Amos Bird](https://github.com/amosbird), who is one of the most active ClickHouse community members and contributors, at the same time being a last year PhD student at this institution.
-
-Alexey with the event announcement:
-![Alexey with the event announcement](https://blog-images.clickhouse.com/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019/1.jpg)
-
diff --git a/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md b/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md
deleted file mode 100644
index 46685db0c37..00000000000
--- a/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: 'ClickHouse Meetup in Beijing on June 8, 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/main.jpg'
-date: '2019-06-13'
-tags: ['meetup','Beijing','China','events']
----
-
-24th ClickHouse Meetup globally and 3rd one in China took place in Beijing on Dragon Boat Festival weekend, which appeared to have a rich history and be a popular opportunity for Chinese people to travel around the country. Nevertheless the ClickHouse Meetup venue was more than full as usual, this time kindly provided by Gaea Mobile, with hundreds more people watching live broadcast online. ClickHouse team have extensively used this trip as an opportunity to strengthen the bond with ClickHouse Community in China by also giving an [open lecture in  Institute of Computing Technology, Chinese Academy of Science](clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md) and by having a private conversations with the most active local corporate users including ByteDance and JD.com.
-
-Welcome word by William Kwok, CTO of Analysys, who played the key role in making this event in particular possible and also in establishment of ClickHouse Community in China:
-![William Kwok, CTO of Analysys](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/1.jpg)
-
-He's also administering ClickHouse WeChat groups, feel free to ask him for invite (@guodaxia2999 at WeChat):
-![@guodaxia2999 at WeChat](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/2.jpg)
-
-Alexey Milovidov from ClickHouse core developers team at Yandex got the content part of main event part started with overview of new features and roadmap overview:
-![Alexey Milovidov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/3.jpg)
-
-Amos Bird, one of the most active ClickHouse contributors either in China and worldwide, shares his experience of using ClickHouse for graph processing ([slides](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup24/2.%20SQLGraph%20--%20When%20ClickHouse%20marries%20graph%20processing%20Amoisbird.pdf)):
-![Amos Bird](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/4.jpg)
-
-Yan Gangqiang from Golden Data shares details of their approach to data storage for surveys system based on ClickHouse ([slides](https://presentations.clickhouse.com/meetup24/3.%20金数据数据架构调整方案Public.pdf)):
-![Yan Gangqiang](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/5.jpg)
-
-ClickHouse for beginners talk by Percent ([slides](https://presentations.clickhouse.com/meetup24/4.%20ClickHouse万亿数据双中心的设计与实践%20.pdf)):
-![Percent](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/6.jpg)
-
-ClickHouse core developer Nikolay Kochetov demonstrates upcoming query execution pipeline changes ([slides](https://presentations.clickhouse.com/meetup24/5.%20Clickhouse%20query%20execution%20pipeline%20changes/)):
-![Nikolay Kochetov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/7.jpg)
-
-Pre-meetup meeting with active ClickHouse community members in China:
-![Pre-meetup meeting](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/8.jpg)
-
-ClickHouse branded Beijing duck :)
-![ClickHouse branded Beijing duck](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/9.jpg)
diff --git a/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md b/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md
deleted file mode 100644
index 0ca02aaac66..00000000000
--- a/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: 'ClickHouse Meetup in Limassol on May 7, 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/main.jpg'
-date: '2019-05-14'
-tags: ['meetup', 'Cyprus', 'Limassol', 'events']
----
-
-The first open-air ClickHouse Meetup took place in the heart of Limassol, the second-largest city of Cyprus, on the roof kindly provided by Exness Group. The views were stunning, but speakers did a great job competing with them for audience attention. Over one hundred people have joined in, which once again confirms high interest in ClickHouse around the globe. Meetup content is also available as [video recording](https://www.youtube.com/watch?v=_rpU-TvSfZ8).
-
-![Intro](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/1.jpg)
-
-[Kirill Shvakov](https://github.com/kshvakov) has played the key role in making this event possible by reaching out to the ClickHouse Community at Cyprus, finding the great venue, and other speakers. Most of the worldwide ClickHouse Meetups happen thanks to active community members like Kirill, if you want to help us organize ClickHouse Meetup in your area, please reach the ClickHouse team via [this form](https://clickhouse.com/#meet) or any other convenient way.
-
-![Kirill Shvakov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/2.jpg)
-
-Kirill is well known for his top-notch [ClickHouse Go Driver](https://github.com/clickhouse/clickhouse-go) running over native protocol, but his opening talk was about his experience optimizing ClickHouse queries and solving real-world tasks at Integros and Wisebits. [Slides](https://presentations.clickhouse.com/meetup22/strategies.pdf). [Full query listings](https://github.com/kshvakov/ClickHouse-Meetup-Exness).
-
-The event has begun in the early evening...
-![Evening in Limassol](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/3.jpg)
-
-...but it took just around one hour for nature to turn the night mode on. It made the projected slides easier to read.
-![Night in Limassol](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/4.jpg)
-
-Sergey Tomilov with his colleagues from the Exness Platform Team has shared details on the evolution of their systems for analyzing logs and metrics and how they ended up relying on ClickHouse for long-term storage ([slides](https://presentations.clickhouse.com/meetup22/exness.pdf)):
-![Sergey Tomilov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/5.jpg)
-
-Alexey Milovidov from the ClickHouse team has demonstrated features from recent ClickHouse releases and gave an update on what's coming soon ([slides](https://presentations.clickhouse.com/meetup22/new_features/)):
-![Alexey Milovidov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/6.jpg)
-
-Alexander Zaitsev, CTO of Altinity, have shown an overview of how to integrate ClickHouse into environments running on Kubernetes ([slides](https://presentations.clickhouse.com/meetup22/kubernetes.pdf)):
-![Alexander Zaitsev, CTO of Altinity](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/7.jpg)
-
-Vladimir Goncharov, a backend engineer from Aloha Browser, has closed the ClickHouse Limassol Meetup by demonstrating few projects that allow integrating other opensource tools for logs processing with ClickHouse ([slides](https://presentations.clickhouse.com/meetup22/aloha.pdf)):
-![Vladimir Goncharov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/8.jpg)
-
-Unfortunately, midnight was closing in and only the most weather-proof ClickHouse fans have managed to stay the whole event as it started getting pretty chilly.
-
-![Final](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/9.jpg)
-
-More photos from the event are available at [short event afterword by Exness](https://www.facebook.com/events/386638262181785/permalink/402167077295570/).
-
diff --git a/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md b/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md
deleted file mode 100644
index e166c2227ff..00000000000
--- a/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: 'ClickHouse Meetup in Madrid on April 2, 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/main.jpg'
-date: '2019-04-11'
-tags: ['meetup', 'Spain', 'Madrid', 'events']
----
-
-Madrid ClickHouse Meetup has probably been the largest one in the EU so far with well over one hundred attendees. As usual, we've seen not only people working and living in the same city, Madrid, but also many people who have traveled a long way to join the event and talk about ClickHouse use cases and learn about new and upcoming features. 
-
-Opening word by [Javi Santana](https://twitter.com/javisantana), who personally made this event possible by gathering up all the people and setting up the venue provided by Google Campus for Startups:
-![Javi Santana](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/1.jpg)
-
-Alexander Zaitsev, CTO of Altinity, has introduced ClickHouse to those who're just starting to use it or only considering for future ([slides](https://www.slideshare.net/Altinity/clickhouse-introduction-by-alexander-zaitsev-altinity-cto)):
-![Alexander Zaitsev](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/2.jpg)
-
-Robert Hodges, CEO of Altinity, has probably traveled the longest distance to join the event since he's based in California and he has also [published his thoughts on this event in the Altinity blog](https://www.altinity.com/blog/2019/4/9/madrid-clickhouse-meetup-summary).
-
-Alexey Milovidov from Yandex has shown the recent advancements in ClickHouse features and briefly walked the audience through the current roadmap ([slides](https://presentations.clickhouse.com/meetup21/new_features/)):
-![Alexey Milovidov from Yandex](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/3.jpg)
-
-Iago Enriquez from Idealista was talking about their migration from “legacy” commercial DBMS to ClickHouse. It was the first time we've heard that someone talking about using two flagship opensource products by Yandex together in production. They are using [CatBoost](https://catboost.ai/) model inference right from ClickHouse SQL queries to fill in the incompleteness of their source data. Unfortunately, slides of Iago's talk were not allowed to be published.
-![Iago Enriquez from Idealista](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/4.jpg)
-
-David Pardo Villaverde from Corunet gave a talk about how they've used ClickHouse to prepare data for dense model generation for one of their clients. It took a pretty short time on a single server. Fun quote from conclusions: “If I wasn't already married, I'd marry it! \[ClickHouse\]” ([slides](https://presentations.clickhouse.com/meetup21/predictive_models.pdf)):
-![David Pardo Villaverde from Corunet](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/5.jpg)
-
-Closing talk of the meetup was by Murat Kabilov fro Adjust Gmbh, he was demonstrating his opensource project [pg2ch](https://github.com/mkabilov/pg2ch) that allows to sync data from PostgreSQL to ClickHouse in real-time ([slides](https://presentations.clickhouse.com/meetup21/postgres_to_clickhouse.pdf)).
-![Murat Kabilov fro Adjust Gmbh](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/6.jpg)
diff --git a/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md b/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md
deleted file mode 100644
index aa468fb6aa9..00000000000
--- a/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: 'ClickHouse Meetup in San Francisco on June 4, 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019/main.jpg'
-date: '2019-06-12'
-tags: ['meetup','USA','San Francisco','events', 'California', 'Bay Area']
----
-
-23th ClickHouse Meetup in San Francisco was held in CloudFlare office and co-organized by Altinity. There were about 35 attendees, most of them are experienced ClickHouse users from SF and Bay Area. The meetup started with an introduction by Robert Hodges, Altinity CEO and continued with a lightning talk by Alan Braithwaite from Segment.com about their experience with ClickHouse. Next talk from Alexander Zaitsev about ClickHouse operator for Kubernetes gained much attention from the audience because Kubernetes is in fact very popular even for databases. At the end there was a presentation from the ClickHouse developer Alexey Milovidov about new and upcoming features with a roadmap. There was a discussion about the details of implementation and design of the most appreciated features. We were happy to meet with ClickHouse contributors at the meetup. Slides from the event are [available on GitHub](https://github.com/clickhouse/clickhouse-presentations/tree/master/meetup23).
-
-As we see increasing demand for ClickHouse events in SF and Bay Area, we have already started planning the next event.
diff --git a/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md b/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md
deleted file mode 100644
index 0d754a3158d..00000000000
--- a/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: 'How to speed up LZ4 decompression in ClickHouse?'
-image: 'https://blog-images.clickhouse.com/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse/main.jpg'
-date: '2019-06-25'
-tags: ['performance', 'lz4', 'article', 'decompression']
-author: 'Alexey Milovidov'
----
-
-When you run queries in [ClickHouse](https://clickhouse.com/), you might notice that the profiler often shows the `LZ_decompress_fast` function near the top. What is going on? This question had us wondering how to choose the best compression algorithm.
-
-ClickHouse stores data in compressed form. When running queries, ClickHouse tries to do as little as possible, in order to conserve CPU resources. In many cases, all the potentially time-consuming computations are already well optimized, plus the user wrote a well thought-out query. Then all that's left to do is to perform decompression.
-
-[Read further](https://habr.com/en/company/yandex/blog/457612/)
diff --git a/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md b/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md
deleted file mode 100644
index c6bfadb8a4b..00000000000
--- a/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: 'Schedule of ClickHouse Meetups in China for 2019'
-image: 'https://blog-images.clickhouse.com/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019/main.jpg'
-date: '2019-04-18'
-tags: ['China', 'Beijing', 'Shanghai', 'Shenzhen', 'announcement', 'meetup']
----
-
-Last year there were two ClickHouse Meetups in Beijing, in [January](../2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md) and [October](../2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md), and they appeared to be in extremely high demand, with fully packed venue and thousands of people watching online. So this year we decided to try to expand meetups to other large cities in China where we see the most interest in ClickHouse based on website visits. Here's the current schedule and sign up pages:
-
--   [ClickHouse Community Meetup in Beijing](https://www.huodongxing.com/event/2483759276200) on June 8.
--   [ClickHouse Community Meetup in Shenzhen](https://www.huodongxing.com/event/3483759917300) on October 20.
--   [ClickHouse Community Meetup in Shanghai](https://www.huodongxing.com/event/4483760336000) on October 27.
-
-到时候那里见！
diff --git a/website/blog/en/2020/five-methods-for-database-obfuscation.md b/website/blog/en/2020/five-methods-for-database-obfuscation.md
deleted file mode 100644
index 02be447ba0c..00000000000
--- a/website/blog/en/2020/five-methods-for-database-obfuscation.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: 'Five Methods For Database Obfuscation'
-image: 'https://blog-images.clickhouse.com/en/2020/five-methods-for-database-obfuscation/main.jpg'
-date: '2020-01-27'
-tags: ['article', 'obfuscation']
-author: 'Alexey Milovidov'
----
-
-ClickHouse users already know that its biggest advantage is its high-speed processing of analytical queries. But claims like this need to be confirmed with reliable performance testing.
-
-[Read further](https://habr.com/en/company/yandex/blog/485096/)
diff --git a/website/blog/en/2020/package-repository-behind-cdn.md b/website/blog/en/2020/package-repository-behind-cdn.md
deleted file mode 100644
index 77919f12266..00000000000
--- a/website/blog/en/2020/package-repository-behind-cdn.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-title: 'Package Repository Behind CDN'
-image: 'https://blog-images.clickhouse.com/en/2020/package-repository-behind-cdn/main.jpg'
-date: '2020-07-02'
-tags: ['article', 'CDN', 'Cloudflare', 'repository', 'deb', 'rpm', 'tgz']
-author: 'Ivan Blinkov'
----
-
-On initial open-source launch, ClickHouse packages were published at an independent repository implemented on Yandex infrastructure. We'd love to use the default repositories of Linux distributions, but, unfortunately, they have their own strict rules on third-party library usage and software compilation options. These rules happen to contradict with how ClickHouse is produced. In 2018 ClickHouse was added to [official Debian repository](https://packages.debian.org/sid/clickhouse-server) as an experiment, but it didn't get much traction. Adaptation to those rules ended up producing more like a demo version of ClickHouse with crippled performance and limited features.
-
-!!! info "TL;DR"
-    If you have configured your system to use <http://repo.yandex.ru/clickhouse/> for fetching ClickHouse packages, replace it with <https://repo.clickhouse.com/>.
-
-Distributing packages via our own repository was working totally fine until ClickHouse has started getting traction in countries far from Moscow, most notably the USA and China. Downloading large files of packages from remote location was especially painful for Chinese ClickHouse users, likely due to how China is connected to the rest of the world via its famous firewall. But at least it worked (with high latencies and low throughput), while in some smaller countries there was completely no access to this repository and people living there had to host their own mirrors on neutral ground as a workaround.
-
-Earlier this year we made the ClickHouse official website to be served via global CDN by [Cloudflare](https://www.cloudflare.com) on a `clickhouse.com` domain. To solve the download issues discussed above, we have also configured a new location for ClickHouse packages that are also served by Cloudflare at [repo.clickhouse.com](https://repo.clickhouse.com). It used to have some quirks, but now it seems to be working fine while improving throughput and latencies in remote geographical locations by over an order of magnitude.
-
-## Switching To Repository Behind CDN
-
-This transition has some more benefits besides improving the package fetching, but let's get back to them in a minute. One of the key reasons for this post is that we can't actually influence the repository configuration of ClickHouse users. We have updated all instructions, but for people who have followed these instructions earlier, **action is required** to use the new location behind CDN. Basically, you need to replace `http://repo.yandex.ru/clickhouse/` with `https://repo.clickhouse.com/` in your package manager configuration.
-
-One-liner for Ubuntu or Debian:
-```bash
-sudo apt-get install apt-transport-https ca-certificates && sudo perl -pi -e 's|http://repo.yandex.ru/clickhouse/|https://repo.clickhouse.com/|g' /etc/apt/sources.list.d/clickhouse.list && sudo apt-get update
-```
-
-One-liner for RedHat or CentOS:
-```bash
-sudo perl -pi -e 's|http://repo.yandex.ru/clickhouse/|https://repo.clickhouse.com/|g' /etc/yum.repos.d/clickhouse*
-```
-
-As you might have noticed, the domain name is not the only thing that has changed: the new URL uses `https://` protocol. Usually, it's considered less important for package repositories compared to normal websites because most package managers check [GPG signatures](https://en.wikipedia.org/wiki/GNU_Privacy_Guard) for what they download anyway. However it still has some benefits: for example, it's not so uncommon for people to download packages via browser, `curl` or `wget`, and install them manually (while for [tgz](https://repo.clickhouse.com/tgz/) builds it's the only option). Fewer opportunities for sniffing traffic can't hurt either. The downside is that `apt` in some Debian flavors has no HTTPS support by default and needs a couple more packages to be installed (`apt-transport-https` and `ca-certificates`).
-
-## Investigating Repository Usage
-
-The next important thing we obtained by using Cloudflare for our package repository is observability. Of course the same could have been implemented from scratch, but it'd require extra resources to develop and maintain, while Cloudflare provides quite rich tools for analyzing what's going on in your domains.
-
-!!! info "Did you know?"
-    It's kind of off-topic, but those Cloudflare features are internally based on ClickHouse, see their [HTTP analytics](https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/) and [DNS analytics](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/) blog posts.
-
-Just a few weeks ago they have also added [cache analytics](https://blog.cloudflare.com/introducing-cache-analytics/) feature, which allowed to drill into how effectively the content is cached on CDN edges and improve the CDN configuration accordingly. For example, it allowed debugging some inconsistencies in cached repository metadata.
-
-## Digging Deeper
-
-All those built-in observability tools provided by Cloudflare share one weak point: they are purely technical and generic, without any domain-specific awareness. They excel at debugging low-level issues, but it's hard to get a higher-level picture based on them. With our package repository scenario, we're not so interested in frequent metadata update requests, but we'd like to see reports on package downloads by version, kind, and so on. We definitely didn't want to operate a separate infrastructure to get those reports, but given there was no out-of-the-box solution, we had to be creative and managed to find a cool middle ground.
-
-Ever heard the [“serverless computing”](https://en.wikipedia.org/wiki/Serverless_computing) hype recently? That was the basic idea: let's assemble a bunch of serverless or managed services to get what we want, without any dedicated servers. The plan was pretty straightforward:
-
-1. Dump details about package downloads to a ClickHouse database.
-2. Connect some [BI](https://en.wikipedia.org/wiki/Business_intelligence) tool to that ClickHouse database and configure required charts/dashboards.
-
-Implementing it required a little bit of research, but the overall solution appeared to be quite elegant:
-
-1. For a ClickHouse database, it was a no-brainer to use [Yandex Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse). With a few clicks in the admin interface, we got a running ClickHouse cluster with properly configured high-availability and automated backups. Ad-hoc SQL queries could be run from that same admin interface.
-2. Cloudflare allows customers to run custom code on CDN edge servers in a serverless fashion (so-called [workers](https://workers.cloudflare.com)). Those workers are executed in a tight sandbox which doesn't allow for anything complicated, but this feature fits perfectly to gather some data about download events and send it somewhere else. This is normally a paid feature, but special thanks to Connor Peshek from Cloudflare who arranged a lot of extra features for free on `clickhouse.com` when we have applied to their [open-source support program](https://developers.cloudflare.com/sponsorships/).
-3. To avoid publicly exposing yet another ClickHouse instance (like we did with **[playground](/docs/en/getting-started/playground/)** regardless of being a 100% anti-pattern), the download event data is sent to [Yandex Cloud Functions](https://cloud.yandex.com/services/functions). It's a generic serverless computing framework at Yandex Cloud, which also allows running custom code without maintaining any servers, but with less strict sandbox limitations and direct access to other cloud services like Managed ClickHouse that was needed for this task.
-4. It didn't require much effort to choose a visualization tool either, as [DataLens BI](https://cloud.yandex.com/docs/datalens/) is tightly integrated with ClickHouse, capable to build what's required right from the UI, and satisfies the “no servers” requirement because it's a SaaS solution. Public access option for charts and dashboards have also appeared to be handy.
-
-There's not so much data collected yet, but here's a live example of how the resulting data visualization looks like. For example, here we can see that LTS releases of ClickHouse are not so popular yet *(yes, we have [LTS releases](https://clickhouse.com/docs/en/faq/operations/production/)!)*:
-![iframe](https://datalens.yandex/qk01mwxkgiysm?_embedded=1)
-
-While here we confirmed that `rpm` is at least as popular as `deb`:
-![iframe](https://datalens.yandex/lfvldsf92i2uh?_embedded=1)
-
-Or you can take a look at all key charts for `repo.clickhouse.com` together on a handy **[dashboard](https://datalens.yandex/pjzq4rot3t2ql)** with a filtering possibility.
-
-## Lessons Learned
-
-* CDN is a must-have if you want people from all over the world to download some artifacts that you produce. Beware the huge pay-for-traffic bills from most CDN providers though.
-* Generic technical system metrics and drill-downs are a good starting point, but not always enough.
-* Serverless is not a myth. Nowadays it is indeed possible to build useful products by just integrating various infrastructure services together, without any dedicated servers to take care of.
diff --git a/website/blog/en/2020/pixel-benchmark.md b/website/blog/en/2020/pixel-benchmark.md
deleted file mode 100644
index 632a56d5bc6..00000000000
--- a/website/blog/en/2020/pixel-benchmark.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-title: 'Running ClickHouse on an Android phone'
-image: 'https://blog-images.clickhouse.com/en/2020/pixel-benchmark/main.jpg'
-date: '2020-07-16'
-author: 'Alexander Kuzmenkov'
-tags: ['Android', 'benchmark', 'experiment']
----
-
-
-This is a brief description of my experiments with building ClickHouse on Android. If this is your first time hearing about ClickHouse, it is a suriprisingly fast columnar SQL DBMS for real-time reporting. It's normally used in AdTech and the like, deployed on clusters of hundreds of machines, holding up to petabytes of data. But ClickHouse is straightforward to use on a smaller scale as well &mdash; you laptop will do, and don't be surprised if you are able to process several gigabytes of data per second on this hardware. There is another kind of small-scale, though pretty powerful, platforms, that is ubiquitous now &mdash; smartphones. The conclusion inevitably follows: you must be able to run ClickHouse on your smartphone as well. It's also that I can't help but chuckle at the idea of setting up a high performance mobile OLAP cluster using a dozen of phones. Or also at the idea of seeing the nostalgic `Segmentation fault (core dumped)` on the lovely OLED screen, but I digress. Let's get it going.
-
-## First cheap attempt
-
-I heard somewhere that Android uses the Linux kernel, and I can already run familiar UNIX-like shell and tools using [Termux](https://termux.com/). And ClickHouse already supports ARM platform and even publishes a binary built for 64-bit ARM. This binary also doesn't have a lot of dependencies &mdash; only a pretty old version of `glibc`. Maybe I can just download a ClickHouse binary from CI to the phone and run it?
-
-Turns out it's not that simple.
-
-* The first thing we'll see after trying to run is an absurd error message: `./clickhouse: file is not found`. But it's right there! `strace` helps: what cannot be found is `/lib64/ld-linux-x86-64.so.2`, a linker specified in the ClickHouse binary. The linker, in this case, is a system program that initially loads the application binary and its dependencies before passing control to the application. Android uses a different linker located by another path, this is why we get the error. This problem can be overcome if we call the linker explicitly, e.g. `/system/bin/linker64 $(readlink -f ./clickhouse)`.
-
-* Immediately we encounter another problem: the linker complains that the binary has a wrong type `ET_EXEC`. What does this mean? Android binaries must support dynamic relocation, so that they can be loaded at any address, probably for ASLR purposes. ClickHouse binaries do not normally use position-independent code, because we have measured that it gives a small performance penalty of about 1%. After tweaking compilation and linking flags to include `-fPIC` as much as possible, and battling some really weird linker errors, we finally arrive at a relocatable binary that has a correct type `ET_DYN`.
-
-* But it only gets worse. Now it complains about TLS section offset being wrong. After reading some mail archives where I could barely understand a word, I concluded that Android uses some different layout of memory for the section of the executable that holds thread-local variables, and `clang` from Android toolchain is patched to account for this. After that, I had to accept I won't be able to use familiar tools, and reluctantly turned to the Android toolchain.
-
-## Using the Android toolchain
-
-Surprisingly, it's rather simple to set up. Our build system uses CMake and already supports cross-compilation &mdash; we have CI configurations that cross-compile for Mac, AArch64 Linux and FreeBSD. Android NDK also has integration with CMake and a [manual](https://developer.android.com/ndk/guides/cmake) on how to set it up. Download the Android NDK, add some flags to your `cmake` invocation: `DCMAKE_TOOLCHAIN_FILE=~/android-ndk-r21d/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=28`, and you're done. It (almost) builds. What obstacles do we have this time?
-
-* Our `glibc` compatibility layer has a lot of compilation errors. It borrows `musl` code to provide functions that are absent from older versions of `glibc`, so that we can run the same binary on a wide range of distros. Being heavily dependent on system headers, it runs into all kinds of differences between Linux and Android, such as the limited scope of `pthread` support or just subtly different API variants. Thankfully we're building for a particular version of Android, so we can just disable this and use all needed functions straight from the system `libc`.
-* Some third-party libraries and our CMake files are broken in various unimaginative ways. Just disable everything we can and fix everything we can't. 
-* Some of our code uses `#if defined(__linux__)` to check for Linux platform. This doesn't always work, because Android also exports `__linux__` but there are some API differences.
-* `std::filesystem` is still not fully supported in NDK r21. The support went into r22 that is scheduled for Q3 2020, but I want it right now... Good that we bundle our own forks of `libcxx` and `libcxxabi` to reduce dependencies, and they are fresh enough to fully support C++20. After enabling them, everything works.
-* Weird twenty-screens errors in `std::map<int>` or something like that, that are also resolved by using our `libcxx`.
-
-## On the device
-
-At last, we have a binary we can actually run. Copy it to  the phone, `chmod +x`, `./clickhouse server --config-path db/config.xml`, run some queries, it works!
-
-<img src="https://blog-images.clickhouse.com/en/2020/pixel-benchmark/segfault.png" width="40%"/>
-
-Feels so good to see my favorite message.
-
-It's a full-fledged development environment here in Termux, let's install `gdb` and attach it to see where the segfault happens. Run `gdb clickhouse --ex run '--config-path ....'`, wait for it to lauch for a minute, only to see how Android kills Termux becase it is out of memory. Are 4 GB of RAM not enough, after all? Looking at the `clickhouse` binary, its size is a whoppping 1.1 GB. The major part of the bloat is due to the fact that some of our computational code is heavily specialized for particular data types (mostly via C++ templates), and also the fact that we build and link a lot of third-party libraries statically. A non-essential part of the binary is debug symbols, which help to produce good stack traces in error messages. We can remove them with `strip -s ./clickhouse` right here on the phone, and after that, the size becomes more manageable, about 400 MB. Finally we can run `gdb` and see that the segfault is somewhere in `unw_backtrace`:
-
-```
-Thread 60 "ConfigReloader" received signal SIGSEGV, Segmentation fault.                         
-[Switching to LWP 21873]                        
-0x000000556a73f740 in ?? ()          
-
-(gdb) whe 20                                    
-#0  0x000000556a73f740 in ?? ()                 
-#1  0x000000556a744028 in ?? ()                 
-#2  0x000000556a73e5a0 in ?? ()                 
-#3  0x000000556a73d250 in unw_init_local ()     
-#4  0x000000556a73deb8 in unw_backtrace ()      
-#5  0x0000005562aabb54 in StackTrace::tryCapture() ()                                           
-#6  0x0000005562aabb10 in StackTrace::StackTrace() ()                                           
-#7  0x0000005562a8d73c in MemoryTracker::alloc(long) ()                                         
-#8  0x0000005562a8db38 in MemoryTracker::alloc(long) ()                                         
-#9  0x0000005562a8e8bc in CurrentMemoryTracker::alloc(long) ()                                  
-#10 0x0000005562a8b88c in operator new[](unsigned long) ()                                      
-#11 0x0000005569c35f08 in Poco::XML::NamePool::NamePool(unsigned long) ()                       
-...
-```
-
-What is this function, and why do we need it? In this particular stack trace, we're out of memory, and about to throw an exception for that. `unw_backtrace` is called to produce a backtrace for the exception message. But there is another interesting context where we call it. Believe it or not, ClickHouse has a built-in `perf`-like sampling profiler that can save stack traces for CPU time and real time, and also memory allocations. The data is saved into a `system.trace_log` table, so you can build flame graphs for what your query was doing as simple as piping output of an SQL query into `flamegraph.pl`. This is an interesting feature, but what is relevant now is that it sends signals to all threads of the server to interrupt them at some random time and save their current backtraces, using the same `unw_backtrace` function that we know to segfault. We expect query profiler to be used in production environment, so it is enabled by default. After disabling it, we have a functioning ClickHouse server running on Android.
-
-## Is your phone good enough?
-
-There is a beaten genre of using data sets and queries of a varying degree of syntheticity to prove that a particular DBMS you work on has performance superior to other, less advanced, DBMSes. We've moved past that, and instead use the DBMS we love as a benchmark of hardware. For this benchmark we use a small 100M rows obfuscated data set from Yandex.Metrica, about 12 GB compressed, and some queries representative of Metrica dashboards. There is [this page](/benchmark/hardware/) with crowdsourced results for various cloud and traditional servers and even some laptops, but how do the phones compare? Let's find out. Following [the manual](/docs/en/operations/performance-test/) to download the necessary data to the phone and run the benchmark was pretty straightforward. One problem was that some queries can't run because they use too much memory and the server gets killed by Android, so I had to script around that. Also, I'm not sure how to reset a file system cache on Android, so the 'cold run' data is not correct. The results look pretty good:
-
-<img src="https://blog-images.clickhouse.com/en/2020/pixel-benchmark/compare.png" width="80%"/>
-
-My phone is Google Pixel 3a, and it is only 5 times slower on average than my Dell XPS 15 work laptop. The queries where the data doesn't fit into memory and has to go to disk (the flash, I mean) are noticeably slower, up to 20 times, but mostly they don't complete because the server gets killed &mdash; it only has about 3 GB of memory available. Overall I think the results look pretty good for the phone. High-end models should be even more performant, reaching performance comparable to some smaller laptops.
-
-## Conclusion
-
-This was a rather enjoyable exercise. Running a server on your phone is a nice way to give a demo, so we should probably publish a Termux package for ClickHouse. For this, we have to debug and fix the `unw_backtrace` segfault (I have my fingers crossed that it will be gone after adding `-fno-omit-frame-pointer`), and also fix some quirks that are just commented out for now. Most of the changes required for the Android build are already merged into our master branch.
-
-Building for Android turned out to be relatively simple &mdash; all these experiments and writing took me about four days, and it was the first time I ever did any Android-related programming. The NDK was simple to use, and our code was cross-platform enough so I only had to make minor modifications. If we didn't routinely build for AArch64 and had a hard dependency on SSE 4.2 or something, it would have been a different story.
-
-But the most important takeout is that now you don't have to obsess over choosing a new phone &mdash; just benchmark it with ClickHouse.
-
-
-_2020-07-16 [Alexander Kuzmenkov](https://github.com/akuzm)_
diff --git a/website/blog/en/2020/the-clickhouse-community.md b/website/blog/en/2020/the-clickhouse-community.md
deleted file mode 100644
index 3e5c614430f..00000000000
--- a/website/blog/en/2020/the-clickhouse-community.md
+++ /dev/null
@@ -1,138 +0,0 @@
----
-title: 'The ClickHouse Community'
-image: 'https://blog-images.clickhouse.com/en/2020/the-clickhouse-community/clickhouse-community-history.png'
-date: '2020-12-10'
-author: 'Robert Hodges'
-tags: ['community', 'open source', 'telegram', 'meetup']
----
-
-One of the great “features” of ClickHouse is a friendly and welcoming community. In this article we would like to outline how the ClickHouse community arose, what it is today, and how you can get involved. There is a role for everyone, from end users to contributors to corporate friends. Our goal is to make the community welcoming to every person who wants to join.
-
-But first, let’s review a bit of history, starting with how ClickHouse first developed at [Yandex](https://yandex.com/company/).
-
-## Origins at Yandex
-
-ClickHouse began as a solution for web analytics in [Yandex Metrica](https://metrica.yandex.com/about?). Metrica is a popular service for analyzing website traffic that is now #2 in the market behind Google Analytics. In 2008 [Alexey Milovidov](https://github.com/alexey-milovidov), an engineer on the Metrica team, was looking for a database that could create reports on metrics like number of page views per day, unique visitors, and bounce rate, without aggregating the data in advance. The idea was to provide a wide range of metric data and let users ask any question about them.
-
-This is a classic problem for data warehouses. However, Alexey could not find one that met Yandex requirements, specifically large datasets, linear scaling, high efficiency, and compatibility with SQL tools. In a nutshell: like MySQL but for analytic applications. So Alexey wrote one. It started as a prototype to do GROUP BY operations.
-
-The prototype evolved into a full solution with a name, ClickHouse, short for “Clickstream Data Warehouse”. Alexey added additional features including SQL support and the MergeTree engine. The SQL dialect was superficially similar to MySQL, [which was also used in Metrica](/blog/en/2016/evolution-of-data-structures-in-yandex-metrica/) but could not handle query workloads without complex pre-aggregation. By 2011 ClickHouse was in production for Metrica.
-
-Over the next 5 years Alexey and a growing team of developers extended ClickHouse to cover new use cases. By 2016 ClickHouse was a core Metrica backend service. It was also becoming entrenched as a data warehouse within Yandex, extending to use cases like service monitoring, network flow logs, and event management. ClickHouse had evolved from the original one-person project to business critical software with a full team of a dozen engineers led by Alexey.
-
-By 2016, ClickHouse had an 8 year history and was ready to become a major open source project.  Here’s a timeline that tracks major developments as a time series.
-
-<img src="https://blog-images.clickhouse.com/en/2020/the-clickhouse-community/clickhouse-community-history.png"/>
-
-## ClickHouse goes open source
-
-Yandex open sourced ClickHouse under an Apache 2.0 license in 2016. There were numerous reasons for this step.
-
-* Promote adoption within Yandex by making it easier for internal departments to get builds.
-* Ensure that ClickHouse would continue to evolve by creating a community to nurture it.
-* Motivate developers to contribute to and use ClickHouse due to the open source “cool” factor.
-* Improve ClickHouse quality by making the code public. Nobody wants their name visible on bad code. ;-)
-* Showcase Yandex innovation to a worldwide audience.
-
-Alexey and the development team moved ClickHouse code to a Github repo under the Yandex organization and began issuing community builds as well as accepting external contributions. They simultaneously began regular meetups to popularize ClickHouse and build a community around it. The result was a burst of adoption across multiple regions of the globe.
-
-ClickHouse quickly picked up steam in Eastern Europe. The first ClickHouse meetups started in 2016 and have grown to include 200 participants for in-person meetings and up to 400 for online meetings.  ClickHouse is now widely used in start-ups in Russia as well as other Eastern European countries. Developers located in Eastern Europe continue to supply more contributions to ClickHouse than any other region.
-
-ClickHouse also started to gain recognition in the US and Western Europe. [CloudFlare](https://www.cloudflare.com/) published a widely read blog article about [their success using ClickHouse for DNS analytics](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/).
-
-ClickHouse also took off in China. The first meetup in China took place in 2018 and attracted enormous interest. In-person meetups included over 400 participants.  Online meetings have reached up to 1000 online viewers.
-
-In 2019 a further step occurred as ClickHouse moved out from under the Yandex Github organization into a separate [ClickHouse organization](https://github.com/ClickHouse). The new organization includes ClickHouse server code plus core ecosystem projects like the cpp and ODBC drivers.
-
-ClickHouse community events shifted online following world-wide disruptions due to COVID-19, but growth in usage continued. One interesting development has been the increasing number of startups using ClickHouse as a backend. Many of these are listed on the [ClickHouse Adopters](/docs/en/introduction/adopters/) page. Also, additional prominent companies like eBay, Uber, and Flipcart went public in 2020 with stories of successful ClickHouse usage.
-
-## The ClickHouse community today
-
-As of 2020 the ClickHouse community includes developers and users from virtually every region of the globe. Yandex engineers continue to supply a majority of pull requests to ClickHouse itself. Altinity follows in second place with contributions to ClickHouse core and ecosystem projects. There is also substantial in-house development on ClickHouse (e.g. on private forks) within Chinese internet providers.
-
-The real success, however, has been the huge number of commits to ClickHouse core from people in outside organizations. The following list shows the main outside contributors:
-
-* Azat Khuzhin
-* Amos Bird
-* Winter Zhang
-* Denny Crane
-* Danila Kutenin
-* Hczhcz
-* Marek Vavruša
-* Guillaume Tassery
-* Sundy Li
-* Mikhail Shiryaev
-* Nicolae Vartolomei
-* Igor Hatarist
-* Andrew Onyshchuk
-* BohuTANG
-* Yu Zhi Chang
-* Kirill Shvakov
-* Alexander Krasheninnikov
-* Simon Podlipsky
-* Silviu Caragea
-* Flynn ucasFL
-* [And over 550 more...](https://github.com/ClickHouse/ClickHouse/graphs/contributors)
-
-ClickHouse ecosystem projects are also growing rapidly. Here is a selected list of active Github projects that help enable ClickHouse applications, sorted by number of stars.
-
-* [sqlpad/sqlpad](https://github.com/sqlpad/sqlpad) — Web-based SQL editor that supports ClickHouse
-* [mindsdb/mindsdb](https://github.com/mindsdb/mindsdb) — Predictive AI layer for databases with ClickHouse support
-* [x-ream/sqli](https://github.com/x-ream/sqli) — ORM SQL interface
-* [tricksterproxy/trickster](https://github.com/tricksterproxy/trickster) — HTTP reverse proxy cache and time series dashboard accelerator
-* [ClickHouse/clickhouse-go](https://github.com/ClickHouse/clickhouse-go) — Golang driver for ClickHouse
-* [gohouse/gorose](https://github.com/gohouse/gorose) — A mini database ORM for Golang
-* [ClickHouse/clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-jdbc) — JDBC driver for ClickHouse
-* [brockercap/Bifrost](https://github.com/brokercap/Bifrost) — Middleware to sync MySQL binlog to ClickHouse
-* [mymarilyn/clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) — ClickHouse Python driver with native interface support
-* [Vertamedia/clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana) — Grafana datasource for ClickHouse
-* [smi2/phpClickHouse](https://github.com/smi2/phpClickHouse) — PHP ClickHouse client
-* [AlexAkulov/clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup) — ClickHouse backup and restore using cloud storage
-* [And almost 1200 more...](https://github.com/search?o=desc&p=1&q=clickhouse&s=stars&type=Repositories)
-
-## Resources
-
-With the community growth numerous resources are available to users. At the center is the [ClickHouse org on Github](https://github.com/ClickHouse), which hosts [ClickHouse server code](https://github.com/ClickHouse/ClickHouse).  ClickHouse server documentation is available at the [clickhouse.com](/) website. It has [installation instructions](/docs/en/getting-started/install/) and links to ClickHouse community builds for major Linux distributions as well as Mac, FreeBSD, and Docker.
-
-In addition, ClickHouse users have a wide range of ways to engage with the community and get help on applications.  These include both chat applications as well as meetups.  Here are some links to get started.
-
-* Yandex Meetups — Yandex has regular in-person and online international and Russian-language meetups. Video recordings and online translations are available at the official [YouTube channel](https://www.youtube.com/c/ClickHouseDB/videos). Watch for announcements on the [clickhouse.com](/) site and [Telegram](https://t.me/clickhouse_ru).
-* [SF Bay Area ClickHouse Meetup](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/) — The largest US ClickHouse meetup, with meetings approximately every 2 months.
-* Chinese meetups occur at regular intervals with different sponsors.  Watch for announcements on clickhouse.com.
-* Telegram - By far the largest forum for ClickHouse. It is the best place to talk to ClickHouse devs. There are two groups.
-* [ClickHouse не тормозит](https://t.me/clickhouse_ru) (“ClickHouse does not slow down”) - Russian language Telegram group with 4,629 members currently.
-* [ClickHouse](https://t.me/clickhouse_en) — English language group with 1,286 members.
-* [ClickHouse Community Slack Channel](http://clickhousedb.slack.com) — Public channel for Slack users. It currently has 551 members.
-* [ClickHouse.com.cn](http://clickhouse.com.cn/) — Chinese language site for ClickHouse-related announcements and questions.
-* [Conference Presentations](https://github.com/ClickHouse/clickhouse-presentations) — ClickHouse developers like to talk and do so whenever they can.  Many recent presentations are stored in Github.  Also, look for ClickHouse presentations at Linux Foundation conferences, Data Con LA, Percona Live, and many other venues where there are presentations about data.
-* Technical webinars — Altinity has a large library of technical presentations on ClickHouse and related applications on the [Altinity Youtube channel](https://www.youtube.com/channel/UCE3Y2lDKl_ZfjaCrh62onYA/featured).
-
-If you know of additional resources please bring them to our attention.
-
-## How you can contribute to ClickHouse
-
-We welcome users to join the ClickHouse community in every capacity. There are four main ways to participate.
-
-### Use ClickHouse and share your experiences
-
-Start with the documentation. Download ClickHouse and try it out. Join the chat channels. If you encounter bugs, [log issues](https://github.com/ClickHouse/ClickHouse/issues) so we can get them fixed. Also, it’s easy to make contributions to the documentation if you have basic Github and markdown skills. Press the pencil icon on any page of the clickhouse.com website to edit pages and automatically generate pull requests to merge your changes.
-
-If your company has deployed ClickHouse and is comfortable talking about it, please don't be shy. Add them to the [ClickHouse Adopters](/docs/en/introduction/adopters/) page so that others can learn from your experience.
-
-### Become a ClickHouse developer
-
-Write code to make ClickHouse better. Here are your choices.
-
-* ClickHouse server — Start with the [“For Beginners” documentation](/docs/en/development/developer-instruction/) to learn how to build ClickHouse and submit PRs. Check out the current ClickHouse issues if you are looking for work. PRs that follow the development standards will be merged faster.
-
-* Ecosystem projects — Most projects in the ClickHouse ecosystem accept PRs.  Check with each project for specific practices.
-
-ClickHouse is also a great target for research problems.  Overall the years many dozens of university CS students have worked on ClickHouse features. Alexey Milovidov maintains an especially rich set of [project suggestions for students](https://github.com/ClickHouse/ClickHouse/issues/15065). Join Telegram and ask for help if you are interested.  Both Yandex and Altinity also offer internships.
-
-## Where we go from here
-
-ClickHouse has grown enormously from its origins as a basic prototype in 2008 to the popular SQL data warehouse users see today. Our community is the rock that will enable ClickHouse to become the default data warehouse worldwide. We are working together to create an inclusive environment where everyone feels welcome and has an opportunity to contribute. We welcome you to join!
-
-This article was written with kind assistance from Alexey Milovidov, Ivan Blinkov, and Alexander Zaitsev.
-
-_2020-12-11 [Robert Hodges](https://github.com/hodgesrm)_
diff --git a/website/blog/en/2021/clickhouse-inc.md b/website/blog/en/2021/clickhouse-inc.md
deleted file mode 100644
index 1f420ef1dba..00000000000
--- a/website/blog/en/2021/clickhouse-inc.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: 'Introducing ClickHouse, Inc.'
-image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-inc/home.png'
-date: '2021-09-20'
-author: 'Alexey Milovidov'
-tags: ['company', 'incorporation', 'yandex', 'community']
----
-
-Today I’m happy to announce **ClickHouse Inc.**, the new home of ClickHouse. The development team has moved from Yandex and joined ClickHouse Inc. to continue building the fastest (and the greatest) analytical database management system. The company has received nearly $50M in Series A funding led by Index Ventures and Benchmark with participation by Yandex N.V. and others. I created ClickHouse, Inc. with two co-founders, [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/) and [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/). I will continue to lead the development of ClickHouse as Chief Technology Officer (CTO), Yury will run product and engineering, and Aaron will be CEO.
-
-## History of ClickHouse
-
-I started developing ClickHouse more than ten years ago, and it has never been an easy ride. The idea of ClickHouse came up while I was working in Yandex as a developer of a real-time web analytics system. My team and I faced multiple data processing challenges that often required custom data structures and sophisticated algorithms, creative solutions and tradeoffs, deep understanding of domain area, hardware, and math. All these years, I often went to bed with endless thoughts about how we could solve yet another data processing challenge. I love data and processing in extreme constraints, where you have to think about bytes and nanoseconds to save petabytes and seconds. The ClickHouse team shares this passion: in my opinion, this is the main reason for ClickHouse’s success.
-
-In 2009 we started ClickHouse as an experimental project to check the hypothesis if it's viable to generate analytical reports in real-time from non-aggregated data that is also constantly added in real-time. It took three years to prove this hypothesis, and in 2012 ClickHouse launched in production for the first time. Unlike custom data structures used before, ClickHouse was applicable more generally to work as a database management system. After several years I found that most departments in my company were using ClickHouse, and it made me wonder: maybe ClickHouse is too good to run only inside Yandex? Then we released it in [open source](https://github.com/ClickHouse/ClickHouse) in 2016.
-
-## ClickHouse in Open Source
-
-Making ClickHouse open source was also not an easy decision, but now I see: doing open source is hard, but it is a big win. While it takes a tremendous effort and responsibility to maintain a popular open-source product, for us, the benefits outweigh all the costs. Since we published ClickHouse, it has been deployed in production in thousands of companies across the globe for a wide range of use cases, from agriculture to self-driving cars. In 2019 we spent over a third of our time abroad organizing various ClickHouse events and speaking at external conferences, and we’re thrilled to see you all again in person once travel restrictions become less severe. The feedback and contributions from our community are priceless, and we improve the quality of implementation, the feature completeness, and making product decisions with the help of our community. One of our main focuses is to make ClickHouse welcoming for contributors by making the source code easy to read and understand, with the processes easy to follow. For me, ClickHouse is a showcase so everyone can learn the ideas in data processing.
-
-I like to present ClickHouse as the answer to many questions in software engineering. What is better: vectorization or JIT compilation? Look at ClickHouse; it is using both. How to write the code in modern C++ in a safe way? Ok, look at the testing infrastructure in ClickHouse. How to optimize the memcpy function? What is the fastest way to transform a Unix timestamp to date in a custom timezone? I can do multiple-hour talks about these topics, and thanks to the open-source, everyone can read the code, run ClickHouse and validate our claims.
-
-## Technical Advantage
-
-The most notable advantage of ClickHouse is its extremely high query processing speed and data storage efficiency. What is unique about ClickHouse performance? It is difficult to answer because there is no single "[silver bullet](https://www.youtube.com/watch?v=ZOZQCQEtrz8)". The main advantage is attention to details of the most extreme production workloads. We develop ClickHouse from practical needs. It has been created to solve the needs of Metrica, one of the [most widespread](https://w3techs.com/technologies/overview/traffic_analysis) web analytics services in the world. So ClickHouse is capable of processing 100+ PBs of data with more than 100 billion records inserted every day. One of the early adopters, Cloudflare, uses ClickHouse to process a large portion of all HTTP traffic on the internet with 10+ million records per second. As ClickHouse developers, we don’t consider the task solved if there is room for performance improvement.
-
-Query processing performance is not only about speed. It opens new possibilities. In previous generation data warehouses, you cannot run interactive queries without pre-aggregation; or you cannot insert new data in real time while serving interactive queries; or you cannot just store all your data. With ClickHouse, you can keep all records as long as you need and make interactive real-time reporting across the data. Before using ClickHouse, it was difficult to imagine that analytical data processing could be so easy and efficient: there is no need for a dozen pre-aggregating and tiering services (e.g. Druid), no need to place huge data volumes in RAM (e.g. Elastic), and no need to maintain daily/hourly/minutely tables (e.g. Hadoop, Spark).
-
-Most other database management systems don’t even permit benchmarks (through the infamous "DeWitt clause"). But we don’t fear benchmarks; we [collect them](https://github.com/ClickHouse/ClickHouse/issues/22398). ClickHouse documentation has [links](/docs/en/getting-started/example-datasets/) to publicly available datasets up to multiple terabytes in size from various domain areas. We encourage you to try ClickHouse, do some experiments on your workload, and find ClickHouse faster than others. And if not, we encourage you to publish the benchmark, and we will make ClickHouse better!
-
-Lastly, ClickHouse was purpose-built from the beginning to:
-
-— Be easy to install and use. It runs everywhere, from your laptop to the cloud
-— Be highly reliable and scale both vertically and horizontally
-— Provide SQL with many practical and convenient extensions
-— Integrate with foreign data sources and streams
-
-## ClickHouse Spinout From Yandex
-
-Yandex N.V. is the largest internet company in Europe and employs over 14,000 people. They develop search, advertisement, and e-commerce services, ride tech and food tech solutions, self-driving cars... and also ClickHouse with a team of 15 engineers. It is hard to believe that we have managed to build a world-class leading analytical DBMS with such a small team while leveraging the global community. While this was barely enough to keep up with the development of the open-source product, everyone understands that the potential of ClickHouse technology highly outgrows such a small team.
-
-We decided to unite the resources: take the team of core ClickHouse developers, bring in a world-class business team led by [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/) and a cloud engineering team led by [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/), keep the power of open source, add the investment from the leading VC funds, and make an international company 100% focused on ClickHouse. I’m thrilled to announce ClickHouse, Inc.
-
-## What’s Next?
-
-Companies love ClickHouse because it gives tremendous improvements in data processing efficiency. But it is mostly about the core technology, the database server itself. We want to make ClickHouse suitable for all kinds of companies and enterprises, not just tech-savvy internet companies who are fine with managing their clusters. We want to lower the learning curve, make ClickHouse compliant with enterprise standards, make ClickHouse service to be instantly available in the cloud in a serverless way, make auto-scaling easy, and much more.
-
-Our mission is to make ClickHouse the first choice of analytical database management systems. Whenever you think about data analytics, ClickHouse should be the obvious preferred solution. I see how many companies already benefit from ClickHouse and I'm very eager to make it even more widespread and universally accepted across the world. Now we have the best engineers and the best entrepreneurs together and we are ready for the mission.
-
-
-_2021-09-20, [Alexey Milovidov](https://github.com/alexey-milovidov)_
diff --git a/website/blog/en/2021/clickhouse-october-moscow-meetup.md b/website/blog/en/2021/clickhouse-october-moscow-meetup.md
deleted file mode 100644
index fb77a5912e5..00000000000
--- a/website/blog/en/2021/clickhouse-october-moscow-meetup.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: 'ClickHouse Moscow Meetup October 19, 2021'
-image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-october-moscow-meetup/featured.jpg'
-date: '2021-11-11'
-author: 'Rich Raposa'
-tags: ['company', 'community']
----
-
-ClickHouse organized an online Meetup on October 19, 2021, hosted by our very own co-founder and CTO, Alexey Milovidov. There are a lot of new features to discuss in the 21.10 version of ClickHouse, along with many more new features coming up on the roadmap.
-
-There were over 200 attendees in person for the Meetup and 3,853 viewers online, and we want to thank everyone who attended live. You can watch the recording of the Meetup on YouTube [here](https://www.youtube.com/watch?v=W6h3_xykd2Y).
-
-Alexey Milovidov, Chief Technology Officer, welcomed and updated the community on ClickHouse Inc.'s latest news. Maksim Kita, Sr. Software Engineer at ClickHouse, started with a discussion on the new User Defined Functions (UDFs) available in 21.10. UDFs can be defined as lambda expressions using the CREATE FUNCTION command. For example:
-
-```
-CREATE FUNCTION a_plus_b AS (a, b) -> a + b
-```
-
-In addition to UDFs, there are two new table engines - Executable and ExecutablePool - that can stream records via stdin and stdout through custom scripts written in whatever language you prefer. For details, be sure to check out our [new training lesson on What's New in ClickHouse 21.10](https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.10/).
-
-You can now encrypt your data stored on S3, HDFS, external disks, or on a local disk. ClickHouse developers Vitaly Baranov and Artur Filatenkov discussed the details and benefits of encrypting your data at rest in ClickHouse. Vitaly presented the new full disk encryption feature and Arthur presented column-level encryption.
-
-![Disk Encryption Performance](https://blog-images.clickhouse.com/en/2021/clickhouse-october-moscow-meetup/disk-encryption-performance.jpg)
-
-![Arthur Filatenkov](https://blog-images.clickhouse.com/en/2021/clickhouse-october-moscow-meetup/arthur-filatenkov.jpg)
-
-Alexey then spent 40 minutes discussing some of the amazing new features on the ClickHouse roadmap, including:
-
-* ClickHouse Keeper: a new C++ coordination system for ClickHouse designed as an alternative to ZooKeeper
-* Support for working with semi-structured data, including JSON objects with arbitrary nested objects
-* Asynchronous insert mode - now you can insert data without batching!
-
-After the talk, Alexey took questions from users on:
-
-* How to parse User-Agent in ClickHouse 
-* Is it true that ClickHouse developers have a ClickHouse tattoo
-
-![YAML Configuration](https://blog-images.clickhouse.com/en/2021/clickhouse-october-moscow-meetup/yaml-configuration.jpg)
-
-* If you are excited about ClickHouse, be sure to join us on [Telegram](https://t.me/clickhouse_en)
-* We also have a community Slack workspace be sure to join [here](https://clickhousedb.slack.com/).
-* If you are new to ClickHouse and want to see it in action, check out our [Getting Started lesson](https://clickhouse.com/learn/lessons/gettingstarted/).
diff --git a/website/blog/en/2021/clickhouse-raises-250m-series-b.md b/website/blog/en/2021/clickhouse-raises-250m-series-b.md
deleted file mode 100644
index 3f6fd9d3928..00000000000
--- a/website/blog/en/2021/clickhouse-raises-250m-series-b.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: 'ClickHouse raises a $250M Series B at a $2B valuation...and we are hiring'
-image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-raises-250m-series-b/featured.jpg'
-date: '2021-10-28'
-author: 'Dorota Szeremeta'
-tags: ['company', 'investment']
----
-
-Today, we are excited to announce that ClickHouse has raised $250 million in Series B funding at a $2B valuation. The round was led by Coatue and Altimeter, with participation from existing investors Index, Benchmark, Yandex, Almaz, and Lead Edge alongside new investors Lightspeed, Redpoint, and FirstMark. We are thrilled to partner with such an accomplished group. Not only is it a testament to the disruptive potential of our technology and our momentum to date, but more importantly, it’s an aggressive investment in our future. This funding will enable ClickHouse to grow our team, scale the product, and continue building a world-class, commercial-grade cloud solution that’s secure, compliant, and convenient for any customer to use. (You can read more about the funding round in our press release [here](https://www.businesswire.com/news/home/20211028005287/en)). 
-
-For the past five years, ClickHouse thrived as a popular open-source product— with a dedicated user community. ClickHouse thrived for a simple reason—we deliver high query processing speed and data storage efficiency that is unmatched. ClickHouse is capable of processing 100+ PBs of data with more than 100 billion records inserted every day. It is 100-1000X faster than traditional approaches and this speed and efficiency has attracted customers that are household names. The commercial potential for the product was clear - and in September 2021, we decided to combine resources and officially incorporate as a company. We took the team of core ClickHouse developers led by ClickHouse creator [Alexey Milovidov](https://www.linkedin.com/in/alexey-milovidov-7b658135/) and brought in a world-class business team led by [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/) and a cloud engineering team led by [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/).
-
-Fueled by this large investment, we are hiring. We plan to double our team this year, and double it again next year. We are calling on all visionaries, builders, and contributors to join us as we build ClickHouse into a transformative, paradigm-shifting company. Our mission is to become the first choice of analytical database management systems. We are relentlessly focused on building an enterprise-grade, highly secure, and fault tolerant, multi-tenant service in the cloud that is accessible to organizations across sizes and sectors. 
-
-If this sounds like something you want to be a part of, now’s the time to join us. To learn more about the positions we are hiring for, and what we are looking for in new hires, visit [clickhouse.com/careers](/careers/).
diff --git a/website/blog/en/2021/clickhouse-v21.10-released.md b/website/blog/en/2021/clickhouse-v21.10-released.md
deleted file mode 100644
index 145f23ff129..00000000000
--- a/website/blog/en/2021/clickhouse-v21.10-released.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: 'ClickHouse v21.10 Released'
-image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-v21-10/featured.jpg'
-date: '2021-10-14'
-author: 'Rich Raposa, Alexey Milovidov'
-tags: ['company', 'community']
----
-
-We're excited to share with you our first release since [announcing ClickHouse, Inc](https://clickhouse.com/blog/en/2021/clickhouse-inc/). The 21.10 release includes new contributions from multiple contributors including many in our community, and we are grateful for your ongoing ideas, development, and support. Our Engineering team continues to be laser-focused on providing our community and users with the fastest and most scalable OLAP DBMS available while implementing many new features. In the 21.10 release, we have a wonderful 79 contributors with 1255 commits across 211 pull requests - what an amazing community and we cherish your contributions.
-
-Let's highlight some of these new exciting new capabilities in 21.10:
-
-* User-defined functions (UDFs) can now be [created as lambda expressions](https://clickhouse.com/docs/en/sql-reference/functions/#higher-order-functions). For example, `CREATE FUNCTION plus_one as (a) -> a + 1`
-* Two new table engines: Executable and ExecutablePool which allow you to stream the results of a query to a custom shell script
-* Instead of logging every query (which can be a lot of logs!), you can now log a random sample of your queries. The number of queries logged is determined by defining a specified probability between 0.0 (no queries logged) and 1.0 (all queries logged) using the new `log_queries_probability` setting.
-* Positional arguments are now available in your GROUP BY, ORDER BY and LIMIT BY clauses. For example, `SELECT foo, bar, baz FROM my_table ORDER BY 2,3` orders the results by whatever the bar and baz columns (no need to specify column names twice!)
-
-We're also thrilled to announce some new free training available to you in our Learn ClickHouse portal: [https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.10/](https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.10/)
-
-We're always listening for new ideas, and we're happy to welcome new contributors to the ClickHouse project. Whether for submitting code or improving our documentation and examples, please get involved by sending us a pull request or submitting an issue. Our beginner developers contribution guide will help you get started: [https://clickhouse.com/docs/en/development/developer-instruction/](https://clickhouse.com/docs/en/development/developer-instruction/)
-
-
-## ClickHouse Release Notes 
-
-Release 21.10
-
-Release Date: 2021-10-17
-
-Release Notes: [21.10](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md)
diff --git a/website/blog/en/2021/clickhouse-v21.11-released.md b/website/blog/en/2021/clickhouse-v21.11-released.md
deleted file mode 100644
index 0f478848410..00000000000
--- a/website/blog/en/2021/clickhouse-v21.11-released.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-title: 'ClickHouse v21.11 Released'
-image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-v21-11/featured-dog.jpg'
-date: '2021-11-11'
-author: 'Rich Raposa, Alexey Milovidov'
-tags: ['company', 'community']
----
-
-We're continuing our monthly release cadence and blog updates at[ ClickHouse, Inc](https://clickhouse.com/blog/en/2021/clickhouse-inc/). The 21.11 release includes asynchronous inserts, interactive mode, UDFs, predefined connections, and compression gains. Thank you to the 142 committers and 4337 commits for making this release possible. 
-
-Let's highlight some of these new exciting new capabilities in 21.11:
-
-## Async Inserts
-
-New asynchronous INSERT mode allows to accumulate inserted data and store it in a single batch utilizing less disk resources(IOPS) enabling support of high rate of INSERT queries. On a client it can be enabled by setting `async_insert` for `INSERT` queries with data inlined in a query or in a separate buffer (e.g. for `INSERT` queries via HTTP protocol). If `wait_for_async_insert` is true (by default) the client will wait until data will be flushed to the table. On the server-side it can be tuned by the settings `async_insert_threads`, `async_insert_max_data_size` and `async_insert_busy_timeout_ms`. 
-
-**How does this help our ClickHouse Users?**
-
-A notable pain point for users was around having to insert data in large batches and performance can sometimes be hindered. What if you have a monitoring use case and you want to do 1M records per second into ClickHouse; you would do large 100k record batches, but if you have 1,000 clients shipping data then that was hard to collect these batches to insert into ClickHouse. Historically to solve for this you might have to use Kafka or buffer tables to help with the balancing and insertion of data.
-
-Now, we've introduced this new mode of Async inserts where you can do a high rate of small inserts concurrently and ClickHouse will automatically group them together into batches and insert it into the table automatically. Every client will get an acknowledgement that the data was inserted successfully.
-
-## Local Interactive Mode
-
-We have added interactive mode for `clickhouse-local` so that you can just run `clickhouse-local` to get a command line ClickHouse interface without connecting to a server and process data from files and external data sources.
-
-**How does this help our ClickHouse Users?**
-
-What if you have an ad-hoc use case that you want to run analytics on a local file with ClickHouse? Historically, you'd have to spin up an empty ClickHouse server and connect it to the external data source that you were interested in running the query on e.g. S3, HDFS, URL's. Now with ClickHouse Local you can just run it just like a ClickHouse Client and have the same full interactive experience without any additional overhead steps around setup and ingestion of data to try out your idea or hypothesis. Hope you enjoy!
-
-## Executable UDFs
-
-Added support for executable (scriptable) user defined functions. These are UDFs that can be written in any programming language. 
-
-**How does this help our ClickHouse Users?**
-
-We added UDFs in our 21.10 release. Similar to our October release we're continuing to innovate around the idea of making it more user friendly to plug in tools into ClickHouse as functions. This could be you doing an ML inference in your Python script and now you can define it as a function as available in SQL. Or, what if you wanted to do a DNS lookup? You have a domain name in a ClickHouse table and want to convert to an IP address with some function. Now just plug in an external script and this will go process and convert the domain names into IP addresses.
-
-## Predefined Connections
-
-Allow predefined connections to external data sources. This allows to avoid specifying credentials or addresses while using external data sources, they can be referenced by names instead. 
-
-**How does this help our ClickHouse Users?**
-
-You're just trying to connect ClickHouse to another data source to load data, like MySQL for example, how do you do that? Before this feature you would have to handle all the credentials for MySql, use the MySQL table functions, know the user and password permissions to access certain tables, etc. Now you have a predefined required parameters inside the ClickHouse configuration and the user can just refer to this by a name e.g. MongoDB, HDFS, S3, MySQL and it's a one-time configuration going forward. 
-
-## Compression
-
-Add support for compression and decompression for `INTO OUTFILE` and `FROM INFILE` (with autodetect or with additional optional parameter).
-
-**How does this help our ClickHouse Users?**
-
-Are you just looking to import and export data into ClickHouse more easily if you have compressed data? Before this feature you had to manually specify compression of input and output data into ClickHouse and even for stream insertion you'd still have to manage the decompression there too. Now, you can just write it as a file e.g. mytable.csv.gz --- and, go!
-
-In the last month, we've added new free Training modules including a What's New in 21.11. Take the lesson [here](https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.11/).
-
-## ClickHouse Release Notes 
-
-Release 21.11
-
-Release Date: 2021-11-09
-
-Release Notes: [21.11](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md)
diff --git a/website/blog/en/2021/clickhouse-v21.12-released.md b/website/blog/en/2021/clickhouse-v21.12-released.md
deleted file mode 100644
index 7b4c7862700..00000000000
--- a/website/blog/en/2021/clickhouse-v21.12-released.md
+++ /dev/null
@@ -1,285 +0,0 @@
----
-title: 'What''s New in ClickHouse 21.12'
-image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-v21-12/featured.jpg'
-date: '2021-12-16'
-author: 'Alexey Milovidov, Christoph Wurm'
-tags: ['company', 'community']
----
-
-We're continuing our monthly release cadence. The 21.12 Christmas release includes 2460 new commits from 125 contributors, including 42 new contributors:
-
-> Alex Cao, Amr Alaa, Andrey Torsunov, Constantine Peresypkin, Dmitriy Dorofeev, Egor O'Sten, Elykov Alexandr, Evgeny, Frank Chen, LB, Natasha Murashkina, Peignon Melvyn, Rich Raposa, Roman Chyrva, Roman, SuperDJY, Thom O'Connor, Timur Magomedov, Tom Risse, Tomáš Hromada, cfcz48, cgp, cms, cmsxbc, congbaoyangrou, dongyifeng, frank chen, freedomDR, jus1096, khamadiev, laurieliyang, leosunli, liyang830, loneylee, michael1589, msaf1980, p0ny, qieqieplus, spume, sunlisheng, yandd, zhanghuajie.
-
-If you are wondering, this list is generated by the following command:
-
-```
-clickhouse-local --query "
-    SELECT arrayStringConcat(groupArray(s), ', ')
-    FROM file('contributors-21.12.txt', LineAsString, 's String')
-    WHERE s NOT IN (
-        SELECT *
-        FROM file('contributors-21.11.txt', LineAsString, 's String'))
-    FORMAT TSVRaw"
-```
-
-And to list the contributors, you can always run the
-```
-SELECT * FROM system.contributors
-```
-query on your production server.
-
-Let's highlight some of the new capabilities in 21.12:
-
-
-## ClickHouse Keeper is Feature Complete
-
-In 21.12 `clickhouse-keeper` started to support ["four letter commands"](https://zookeeper.apache.org/doc/r3.4.8/zookeeperAdmin.html#sc_zkCommands) for status and monitoring. This feature is contributed by **JackyWoo** and reviewed by **Alexander Sapin** (the author of ClickHouse Keeper).
-
-It was the only missing feature to implement. In this release, clickhouse-keeper is still considered in pre-production stage, but many companies already started to evaluate and use it as a replacement of ZooKeeper. You can also start using clickhouse-keeper in your testing environments and we will appreciate your feedback.
-
-ClickHouse Keeper development started in Sep 2020, more than a year ago. It was a long road, and most of the efforts were to ensure correctness and stability in unusual and exceptional scenarios. It is covered by [Jepsen](https://jepsen.io/) tests (including ZooKeeper tests and [new introduced tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/jepsen.clickhouse-keeper)), continuous randomized stress testing with ClickHouse functional and integration tests. It is started to be tested in Yandex Cloud and among our best friends. If you're pretending to be our best friend, you can also do it.
-
-**How does this help you?**
-
-ClickHouse Keeper is a drop-in replacement for ZooKeeper. It implements the ZooKeeper wire protocol and data model, but does it better.
-
-In contrast to ZooKeeper, there are no issues with zxid overflow or packet sizes. It has better memory usage and it does not require JVM tuning (because it does not use the JVM). Logs and snapshots are compressed (by about 10x typically) and checksummed. It can run as a separate process or directly inside clickhouse-server. You can use it with ClickHouse or with your Kafkas and Hadoops as well.
-
-[More info](http://presentations.clickhouse.tech/meetup54/keeper.pdf).
-
-
-## Partitions For INSERT INTO File, URL And HDFS Storages
-
-When using the table engines `File`, `URL`, and `HDFS` ClickHouse now supports partitions. When creating a table you can specify the partition key using the `PARTITION BY` clause e.g. `CREATE TABLE hits_files (...) ENGINE = File(TabSeparated) PARTITION BY toYYYYMM(EventDate)`.
-
-Similarly, when exporting data from ClickHouse using the `file`, `url`, and `hdfs` table functions you can now specify that the data is to be partitioned into multiple files using a `PARTITION BY` clause. For example, `INSERT INTO TABLE FUNCTION file('path/hits_{_partition_id}', 'TSV', 'columns...') PARTITION BY toYYYYMM(EventDate) VALUES ...` will create as many files as there are unique months in the dataset.
-
-The `s3` table function has already supported partitioned writes since ClickHouse 21.10.
-
-**How does this help you?**
-
-If data is split into multiple files, `SELECT` queries will be automatically parallelized. For example:
-
-```
-SELECT user_id, count() FROM s3(
-    'https://s3.us-east-2.amazonaws.com/.../*.csv.zstd',
-    '...', '...',
-    CSV,
-    'user_id UInt64, ...')
-```
-
-You can even parallelize data processing across a distributed compute cluster if you use the `s3Cluster` table function:
-
-```
-SELECT user_id, count() FROM s3Cluster(
-    my_cluster,
-    'https://s3.us-east-2.amazonaws.com/.../*.csv.zstd',
-    '...',
-    '...', CSV,
-    'user_id UInt64, ...')
-```
-
-It can also be used for integration with external data processing tools that consume data from `s3`.
-
-
-## FROM INFILE in clickhouse-client now supports glob patterns and parallel reading
-
-Just write:
-
-```
-INSERT INTO my_table FROM INFILE '*.csv.gz' FORMAT CSV
-```
-
-Glob patterns support `*`, `?` and `{n..m}` with `{1..10}` or (aligned) `{01..10}` forms.
-This query will be automatically parallelized and it will also automatically detect the compression format from the file extension and decompress transparently.
-
-This improvement is done by **Arthur Filatenkov**.
-
-**How does this help you?**
-
-Now you don't have to recall how to write a parallel for loop in your command line shell. clickhouse-client will do everything for you, it works intuitively and fast.
-
-
-## Support for INTERVAL operator inside WITH FILL modifier for ORDER BY clause
-
-What's the... `WITH FILL` modifier in the `ORDER BY` clause? Take a look at the example:
-
-```
-:) SELECT EventDate, count() FROM test.hits WHERE CounterID = 2841673 GROUP BY EventDate ORDER BY EventDate
-
-┌──EventDate─┬─count()─┐
-│ 2014-03-17 │       3 │
-│ 2014-03-19 │       6 │
-│ 2014-03-21 │       7 │
-│ 2014-03-22 │       6 │
-└────────────┴─────────┘
-```
-
-We have the report with Mar 17th, 19th, 21st, and 22nd. But Mar 18th and 20th are missing, because there is no data for these dates.
-And this is how it works in all SQL databases.
-
-But ClickHouse also has a quite unique and neat `WITH FILL` modifier for the `ORDER BY` clause.
-
-You just write:
-```
-SELECT EventDate, count() FROM test.hits WHERE CounterID = 2841673 GROUP BY EventDate
-ORDER BY EventDate WITH FILL STEP 1
-
-┌──EventDate─┬─count()─┐
-│ 2014-03-17 │       3 │
-│ 2014-03-18 │       0 │
-│ 2014-03-19 │       6 │
-│ 2014-03-20 │       0 │
-│ 2014-03-21 │       7 │
-│ 2014-03-22 │       6 │
-└────────────┴─────────┘
-```
-
-And missing data is automatically filled.
-
-You can also add `FROM` and `TO`:
-
-```
-ORDER BY EventDate WITH FILL FROM '2014-03-01'::Date TO '2014-03-31'::Date STEP 1;
-```
-
-And it will automatically fill missing rows in the report.
-
-The `STEP` can be an arbitrary number. But what can you do if you want to fill missing dates for a report by months? You cannot just write `STEP 30` or `STEP 31` because different months contain different number of days...
-
-Since ClickHouse version 21.12 you can do it like this:
-
-```
-ORDER BY EventDate WITH FILL STEP INTERVAL 1 MONTH
-```
-
-`INTERVAL` is a standard SQL operator, you can use SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER and YEAR.
-
-This is implemented by **Anton Popov** who is the author of the "WITH FILL" feature.
-
-**How does this help you?**
-
-It allows you to avoid a postprocessing step for your reports.
-
-
-## Add Support For "Identifier" Table and Database Query Parameters
-
-ClickHouse has support for parameterized queries. For example:
-
-```
-SELECT uniq(user_id) FROM table WHERE website = {name:String}
-```
-
-It allows to safely substitute parameters without the risk of SQL injections:
-
-```
-curl https://clickhouse-server:8443/?param_name=upyachka -d 'SELECT uniq(user_id) FROM table WHERE website = {name:String}'
-```
-
-You can even create customized API handlers for clickhouse-server based on prepared queries.
-
-In version 21.12 we introduce support for using parameters for tables and databases in your queries. This is implemented with the `Identifier` table parameter:
-
-```
-SELECT uniq(user_id) FROM {tbl:Identifier}
-```
-
-Identifier parameters also work for CREATE, DROP and all DDL queries. This is implemented by **Nikolai Degterinskiy**.
-
-**How does this help you?**
-
-Let ClickHouse do the heavy lifting and keep your scripts safe and secure.
-
-
-## Bool Data Type
-
-This feature is experimental in version 21.12. It is implemented by **Kevin Wan (MaxWk)** on top of initial work by **hczhcz** and reviewed by **Pavel Kruglov**.
-
-ClickHouse now natively supports a `Bool` data type. It allows to represent values as "true"/"false" during data import and export in text formats. It can also be adjusted to anything else using the settings `bool_true_representation` and `bool_false_representation` (for example, "yes" and "no").
-
-**How does this help you?**
-
-Native boolean data types exist today in other databases that are often integrated with ClickHouse, such as PostgreSQL. The `Bool` data type in ClickHouse will make it more compatible with existing code and ease migration from other databases.
-
-Also it simplifies data ingestion from various text sources.
-
-
-## Query Optimizations With Table Constraints
-
-This feature is [contributed](https://github.com/ClickHouse/ClickHouse/pull/18787) by **Nikita Vasilev**. Nikita is one of the most notable ClickHouse contributors. He started in 2019 by introducing data skipping indices into ClickHouse, then continued in 2020 with SSD-optimized key-value dictionaries and now contributed the new advancements in the query optimizer. This feature is reviewed by **Anton Popov**.
-
-So, what optimizations? ClickHouse already allows to specify constraints for tables:
-
-```
-CREATE TABLE
-(
-    URL String,
-    Domain String,
-    CONSTRAINT validate CHECK isValidUTF8(URL) AND length(URL) BETWEEN 10 AND 10000,
-    CONSTRAINT my_constraint CHECK Domain = domainWithoutWWW(URL)
-) ...
-```
-
-Constraints are checked on `INSERT`. In this example we validate the URL and check that the `Domain` column actually contains the domain of the URL.
-
-Since version 21.12 constraints can also automatically optimize your queries! For example, if you write:
-
-```
-SELECT count() FROM hits WHERE domainWithoutWWW(URL) = 'ghe.clickhouse.tech'
-```
-
-The query can be automatically rewritten to:
-
-```
-SELECT count() FROM hits WHERE Domain = 'ghe.clickhouse.tech'
-```
-
-Because the `Domain` column is smaller and more compressable it will be faster to read and does not require calculation of the domain from the URL.
-The only thing you need to do is to enable the `optimize_using_constraints` and `optimize_substitute_columns` settings.
-
-As a bonus, we introduced a new type of constraint: `ASSUME`.
-
-```
-CONSTRAINT my_constraint ASSUME Domain = domainWithoutWWW(URL)
-```
-
-This type of constraint will not check anything on `INSERT` but still use the assumption to optimize the queries.
-
-It can also do logical inference, simplify the conditions and remove the conditions that are proved to be satisfied by constraints.
-It is controlled by the `convert_query_to_cnf` setting. You can also enable `optimize_append_index`. With this setting ClickHouse will derive more conditions on the table primary key.
-
-The idea is so powerful that we cannot resist adding one more feature: *indices for hypothesis*.
-
-```
-INDEX my_index (a < b) TYPE hypothesis GRANULARITY 1
-```
-
-The expression is checked and the result (true/false) is written as an index for query optimization.
-
-**How does this help you?**
-
-Especially in large ClickHouse deployments with many complex tables it can be hard for users to always be up to date on the best way to query a given dataset. Constraints can help optimize queries without having to change the query structure itself. They can also make it easier to make changes to tables.
-
-For example, let's say you have a table containing web requests and it includes a URL column that contains the full URL of each request. Many times, users will want to know the top level domain (.com, .co.uk, etc.), something ClickHouse provides the `topLevelDomain` function to calculate. If you discover that many people are using this function you might decide to create a new materialized column that pre-calculates the top level domain for each record.
-
-Rather than tell all your users to change their queries you can use a table constraint to tell ClickHouse that each time a user tries to call the `topLevelDomain` function the request should be rewritten to use the new materialized column.
-
-
-## Read Large Remote Files In Chunks
-
-ClickHouse combines a fast query engine and efficient data storage. It also allows to integrate external data sources for data import and export or even to process external datasets on the fly without the need for data import or preprocessing.
-
-When reading large files in `Parquet`, `ORC`, and `Arrow` format using the `s3`, `url`, and `hdfs` table functions, ClickHouse will now automatically choose whether to read the entire file at once or read parts of it incrementally. This is now enabled by default and the setting `remote_read_min_bytes_for_seek` controls when to switch from reading it all to reading in chunks. The default is 1MiB.
-
-`Parquet`, `ORC`, and `Arrow` are column-oriented formats (quite similar to the ClickHouse Native format) and now we can read only requested columns even if they are being read from a remote HTTP server with the `url` table function (range requests will be performed to skip unneeded data).
-
-This feature is implemented by **Kseniia Sumarokova**.
-
-**How does this help our ClickHouse Users?**
-
-In previous versions, when reading files in Arrow-based formats from remote locations with the `s3`, `url`, and `hdfs` table functions, ClickHouse would always read the entire file into memory. This works well when the files are small but will cause excessive memory usage or not work at all when the files are large. With this change, ClickHouse will read large files in chunks to keep memory usage in check and is now able to read even very large files.
-
-
-## ... And Many More
-
-Read the [full changelog](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md) for the 21.12 "Christmas" release for the full list of gifts from the [ClickHouse Team](https://clickhouse.com/company/).
diff --git a/website/blog/en/2021/code-review.md b/website/blog/en/2021/code-review.md
deleted file mode 100644
index d726dc7aa4f..00000000000
--- a/website/blog/en/2021/code-review.md
+++ /dev/null
@@ -1,83 +0,0 @@
----
-title: 'The Tests Are Passing, Why Would I Read The Diff Again?'
-image: 'https://blog-images.clickhouse.com/en/2021/code-review/two-ducks.jpg'
-date: '2021-04-14'
-author: 'Alexander Kuzmenkov'
-tags: ['code review', 'development']
----
-
-
-Code review is one of the few software development techniques that are consistently found to reduce the incidence of defects. Why is it effective? This article offers some wild conjecture on this topic, complete with practical advice on getting the most out of your code review.
-
-
-## Understanding Why Your Program Works
-
-As software developers, we routinely have to reason about the behaviour of software. For example, to fix a bug, we start with a test case that exhibits the behavior in question, and then read the source code to see how this behavior arises. Often we find ourselves unable to understand anything, having to resort to forensic techniques such as using a debugger or interrogating the author of the code. This situation is far from ideal. After all, if we have trouble understanding our software, how can we be sure it works at all? No surprise that it doesn't.
-
-The correct understanding is also important when modifying and extending software. A programmer must always have a precise mental model on what is going on in the program, how exactly it maps to the domain, and so on. If there are flaws in this model, the code they write won't match the domain and won't solve the problem correctly. Wrong understanding directly causes bugs.
-
-How can we make our software easier to understand? It is often said that to see if you really understand something, you have to try explaining it to somebody. For example, as a science student taking an exam, you might be expected to give an explanation to some well-known observed effect, deriving it from the basic laws of this domain. In a similar way, if we are modeling some problem in software, we can start from domain knowledge and general programming knowledge, and build an argument as to why our model is applicable to the problem, why it is correct, has optimal performance and so on. This explanation takes the form of code comments, or, at a higher level, design documents.
-
-If you have a habit of thoroughly commenting your code, you might have noticed that writing the comments is often much harder than writing the code itself. It also has an unpleasant side effect &mdash; at times, while writing a comment, it becomes increasingly clear to you that the code is incomprehensible and takes forever to explain, or maybe is downright wrong, and you have to rewrite it. This is exactly the major positive effect of writing the comments. It helps you find bugs and make the code more understandable, and you wouldn't have noticed these problems unless you tried to explain the code.
-
-Understanding why your program works is inseparable from understanding why it fails, so it's no surprise that there is a similar process for the latter, called "rubber duck debugging". To debug a particularly nasty bug, you start explaining the program logic step by step to an imaginary partner or even to an inanimate object such as a yellow rubber duck. This process is often very effective, much in excess of what one would expect given the limited conversational abilities of rubber ducks. The underlying mechanism is probably the same as with comments &mdash; you start to understand your program better by just trying to explain it, and this lets you find bugs.
-
-When working in a team, you even have a luxury of explaining your code to another developer who works on the same project. It's probably more entertaining than talking to a duck. More importantly, they are going to maintain the code you wrote, so better make sure that _they_ can understand it as well. A good formal occasion for explaining how your code works is the code review process. Let's see how you can get the most out of it, in terms of making your code understandable.
-
-## Reviewing Others Code
-
-Code review is often framed as a gatekeeping process, where each contribution is vetted by maintainers to ensure that it is in line with project direction, has acceptable quality, meets the coding guidelines and so on. This perspective might seem natural when dealing with external contributions, but makes less sense if you apply it to internal ones. After all, our fellow maintainers have perfect understanding of project goals and guidelines, probably they are more talented and experienced than us, and can be trusted to produce the best solution possible. How can an additional review be helpful?
-
-A less-obvious, but very important, part of reviewing the code is just seeing whether it can be understood by another person. It is helpful regardless of the administrative roles and programming proficiency of the parties. What should you do as a reviewer if ease of understanding is your main priority?
-
-You probably don't need to be concerned with trivia such as code style. There are automated tools for that. You might find some bugs, but this is probably a side effect. Your main task is making sense of the code.
-
-Start with checking the high-level description of the problem that the pull request is trying to solve. Read the description of the bug it fixes, or the docs for the feature it adds. For bigger features, there is normally a design document that describes the overall implementation without getting too deep into the code details. After you understand the problem, start reading the code. Does it make sense to you? You shouldn't try too hard to understand it. Imagine that you are tired and under time pressure. If you feel you have to make a lot of effort to understand the code, ask the author for clarifications. As you talk, you might discover that the code is not correct, or it may be rewritten in a more straightforward way, or it needs more comments.
-
-<img src="https://blog-images.clickhouse.com/en/2021/code-review/hidden-items.png"/>
-
-After you get the answers, don't forget to update the code and the comments to reflect them. Don't just stop after getting it explained to you personally. If you had a question as a reviewer, chances are that other people will also have this question later, but there might be nobody around to ask. They will have to resort to `git blame` and re-reading the entire pull request or several of them. Code archaeology is sometimes fun, but it's the last thing you want to do when you are investigating an urgent bug. All the answers should be on the surface.
-
-Working with the author, you should ensure that the code is mostly obvious to anyone with basic domain and programming knowledge, and all non-obvious parts are clearly explained.
-
-### Preparing Your Code For Review
-
-As an author, you can also do some things to make your code easier to understand for the reviewer.
-
-First of all, if you are implementing a major feature, it probably needs a round of design review before you even start writing code. Skipping a design review and jumping right into the code review can be a major source of frustration, because it might turn out that even the problem you are solving was formulated incorrectly, and all your work has to be thrown away. Of course, this is not prevented completely by design review, either. Programming is an iterative, exploratory activity, and in complex cases you only begin to grasp the problem after implementing a first solution, which you then realize is incorrect and has to be thrown away.
-
-When preparing your code for review, your major objective is to make your problem and its solution clear to the reviewer. A good tool for this is code comments. Any sizable piece of logic should have an introductory comment describing its general purpose and outlining the implementation. This description can reference similar features, explain the difference to them, explain how it interfaces with other subsystems. A good place to put this general description is a function that serves as a main entry point for the feature, or other form of its public interface, or the most significant class, or the file containing the implementation, and so on.
-
-Drilling down to each block of code, you should be able to explain what it does, why it does that, why this way and not another. If there are several ways of doing the thing, why did you choose this one? Of course, for some code these things follow from the more general comments and don't have to be restated. The mechanics of data manipulation should be apparent from the code itself. If you find yourself explaining a particular feature of the language, it's probably best not to use it.
-
-Pay special attention to making the data structures apparent in the code, and their meaning and invariants well commented. The choice of data structures ultimately determines which algorithms you can apply, and sets the limits of performance, which is another reason why we should care about it as ClickHouse developers. 
-
-When explaining the code, it is important to give your reader enough context, so that they can understand you without a deep investigation of the surrounding systems and obscure test cases. Give pointers to all the things that might be relevant to the task. If you know some corner cases which your code has to handle, describe them in enough detail so that they can be reproduced. If there is a relevant standard or a design document, reference it, or even quote it inline. If you're relying on some invariant in other system, mention it. It is good practice to add programmatic checks that mirror your comments, when it is easy to do so. Your comment about an invariant should be accompanied by an assertion, and an important scenario should be reproduced by a test case.
-
-Don't worry about being too verbose. There is often not enough comments, but almost never too much of them.
-
-## Common Concerns about Code Comments
-
-It is common to hear objections to the idea of commenting the code, so let's discuss a couple of usual ones.
-
-### Self-documenting Code
-
-You can often see a perplexing idea that the source code can somehow be "self-documenting", or that the comments are a "code smell", and their presence indicates that the code is badly written. I have trouble imagining how this belief can be compatible with any experience in maintaining sufficiently complex and large software, over the years, in collaboration with others. The code and the comments describe different parts of the solution. The code describes the data structures and their transformations, but it cannot convey meaning. The names in the code serve as pointers that map the data and its transformations to the domain concepts, but they are schematic and lack nuance. It is not so difficult to write code that makes it easy to understand what's going on in terms of data manipulation. What it takes is mostly moderation, that is, stopping yourself from being too clever. For most code, it is easy to see what it does, but why? Why this way and not that way? Why is it correct? Why this fast path here helps? Why did you choose this data layout? How is this invariant guaranteed? And so on. This might be not so evident for a developer who is working alone on a short-lived project, because they have all the necessary context in their head. But when they have to work with other people (or even with themselves from past and future), or in an unfamiliar area, the importance of non-code, higher-level context becomes painfully clear. The idea that we should, or even can, somehow encode comments such as [this one](https://github.com/ClickHouse/ClickHouse/blob/26d5db32ae5c9f54b8825e2eca1f077a3b17c84a/src/Storages/MergeTree/KeyCondition.cpp#L1312-L1347) into names or control flow is just absurd.
-
-### Obsolete Comments
-
-The comments can't be checked by the compiler or the tests, so there is no automated way to make sure that they are up to date with the rest of the comments and the code. The possibility of comments gradually getting incorrect is sometimes used as an argument against having any comments at all.
-
-This problem is not exclusive to the comments &mdash; the code also can and does become obsolete. Simple cases such as dead code can be detected by static analysis or studying the test coverage of code. More complex cases can only be found by proofreading, such as maintaining an invariant that is not important anymore, or preparing some data that is not needed.
-
-While an obsolete comment can lead to a mistake, the same applies, perhaps more strongly, to the lack of comments. When you need some higher-level knowledge about the code, but it is not written down, you are forced to perform an entire investigation from first principles to understand what's going on, and this is error-prone. Even an obsolete comment likely gives a better starting point than nothing. Moreover, in a code base that makes an active use of the comments, they tend to be mostly correct. This is because the developers rely on comments, read and write them, pay attention to them during code review. The comments are routinely changed along with changing the code, and the outdated comments are soon noticed and fixed. This does require some habit. A lone comment in a vast desert of impenetrable self-documenting code is not going to fare well.
-
-
-## Conclusion
-
-Code review makes your software better, and a significant part of this probably comes from trying to understand what your software actually does. By paying attention specifically to this aspect of code review, you can make it even more efficient. You'll have less bugs, and your code will be easier to maintain &mdash; and what else could we ask for as software developers?
-
-
-_2021-04-13 [Alexander Kuzmenkov](https://github.com/akuzm). Title photo by [Nikita Mikhaylov](https://github.com/nikitamikhaylov)_
-
-_P.S. This text contains the personal opinions of the author, and is not an authoritative manual for ClickHouse maintainers._
diff --git a/website/blog/en/2021/fuzzing-clickhouse.md b/website/blog/en/2021/fuzzing-clickhouse.md
deleted file mode 100644
index 3fa518aecce..00000000000
--- a/website/blog/en/2021/fuzzing-clickhouse.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-title: 'Fuzzing ClickHouse'
-image: 'https://blog-images.clickhouse.com/en/2021/fuzzing-clickhouse/some-checks-were-not-successful.png'
-date: '2021-03-11'
-author: 'Alexander Kuzmenkov'
-tags: ['fuzzing', 'testing']
----
-
-Testing is a major problem in software development: there is never enough of it. It becomes especially true for a database management system, whose task is to interpret a query language that works on the persistent state managed by the system in a distributed fashion. Each of these three functions is hard enough to test even in isolation, and it gets much worse when you combine them. As ClickHouse developers, we know this from experience. Despite a large amount of automated testing of all kinds we routinely perform as part of our continuous integration system, new bugs and regressions are creeping in. We are always looking for the ways to improve our test coverage, and this article will describe our recent development in this area &mdash; the AST-based query fuzzer.
-
-## How to Test a SQL DBMS
-
-A natural form of testing for a SQL DBMS is to create a SQL script describing the test case, and record its reference result. To test, we run the script and check that the result matches the reference. This is used in many SQL DBMS, and it is the default kind of a test you are expected to write for any ClickHouse feature or fix. Currently we have [73k lines of SQL tests alone](https://github.com/ClickHouse/ClickHouse/tree/master/tests/queries/0_stateless), that reach the [code coverage of 76%](https://clickhouse-test-reports.s3.yandex.net/0/47d684a5c35410201d4dd4f63f3287bf25cdabb7/coverage_report/test_output/index.html).
-
-This form of testing, where a developer writes a few simplified examples of how the feature can and cannot be used, is sometimes called "example-based testing". Sadly, the bugs often appear in various corner cases and intersections of features, and it is not practical to enumerate all of these cases by hand. There is a technique for automating this process, called "property-based testing". It lets you write more general tests of the form "for all values matching these specs, the result of some operation on them should match this other spec". For example, such a test can check that if you add two positive numbers, the result is greater than both of them. But you don't specify which numbers exactly, only these properties. Then, the property testing system randomly generates some examples with particular numbers that match the specification, and checks that the result also matches its specification.
-
-Property-based testing is said to be very efficient, but requires some developer effort and expertise to write the tests in a special way. There is another well-known testing technique that is in some sense a corner case of property-based testing, and that doesn't require much developer time. It is called fuzzing. When you are fuzzing your program, you feed it random inputs generated according to some grammar, and the property you are checking is that your program terminates correctly (no segfaults or assertions or other kinds of program errors). Most often, the grammar of input for fuzzing is simple &mdash; say, bit flips and additions, or maybe some dictionary. The space of possible inputs is huge, so to find interesting paths in it, fuzzing software records the code paths taken by the program under test for a particular input, and focuses on the inputs that lead to new code paths that were not seen before. It also employs some techniques for finding interesting constant values, and so on. In general, fuzzing allows you to find many interesting corner cases in your program automatically, without much developer involvement.
-
-Generating valid SQL queries with bit flips would take a long time, so there are systems that generate queries based on the SQL grammar, such as [SQLSmith](https://github.com/anse1/sqlsmith).  They are succesfully used for finding bugs in databases. It would be interesting to use such a system for ClickHouse, but it requires some up-front effort to support the ClickHouse SQL grammar and functions, which may be different from the standard. Also, such systems don't use any feedback, so while they are much better than systems with primitive grammar, they still might have a hard time finding interesting examples. But we already have a big corpus of human-written interesting SQL queries &mdash; it's in our regression tests. Maybe we can use them as a base for fuzzing? We tried to do this, and it turned out to be surprisingly simple and efficient.
-
-## AST-based Query Fuzzer
-
-Consider some SQL query from a regression test. After parsing, it is easy to mutate the resulting AST (abstract syntax tree, an internal representation of the parsed query) before execution to introduce random changes into the query.  For strings and arrays, we make random modifications such as inserting a random character or doubling the string. For numbers, there are well-known Bad Numbers such as 0, 1, powers of two and nearby, integer limits, `NaN`. `NaN`s proved to be especially efficient in finding bugs, because you can often have some alternative branches in your numeric code, but for a `NaN`, both branches hold (or not) simultaneously, so this leads to nasty effects. 
-
-Another interesting thing we can do is change the arguments of functions, or the list of expressions in `SELECT`, `ORDER BY` and so on. Naturally, all the interesting arguments can be taken from other test queries. Same goes for changing the tables used in the queries. When the fuzzer runs in CI, it runs queries from all the SQL tests in random order, mixing into them some parts of queries it has seen previously. This process can eventually cover all the possible permutations of our features.
-
-The core implementation of the fuzzer is relatively small, consisting of about 700 lines of C++ code. A prototype was made in a couple of days, but naturally it took significantly longer to polish it and to start routinely using it in CI. It is very productive and let us find more than 200 bugs already (see the label [fuzz](https://github.com/ClickHouse/ClickHouse/labels/fuzz) on GitHub), some of which are serious logic errors or even memory errors. When we only started, we could segfault the server or make it enter a never-ending loop with simplest read-only queries such as `SELECT arrayReverseFill(x -> (x < 10), [])` or `SELECT geoDistance(0., 0., -inf, 1.)`. Of course I couldn't resist bringing down our [public playground](https://gh-api.clickhouse.com/play?user=play#LS0gWW91IGNhbiBxdWVyeSB0aGUgR2l0SHViIGhpc3RvcnkgZGF0YSBoZXJlLiBTZWUgaHR0cHM6Ly9naC5jbGlja2hvdXNlLnRlY2gvZXhwbG9yZXIvIGZvciB0aGUgZGVzY3JpcHRpb24gYW5kIGV4YW1wbGUgcXVlcmllcy4Kc2VsZWN0ICdoZWxsbyB3b3JsZCc=) with some of these queries, and was content to see that the server soon restarts correctly.  These queries are actually minified by hand, normally the fuzzer would generate something barely intelligible such as:
-```
-SELECT
-    (val + 257,
-      (((tuple(NULL), 10.000100135803223), tuple(-inf)), '-1', (NULL, '0.10', NULL), NULL),
-      (val + 9223372036854775807) = (rval * 100),
-      tuple(65535), tuple(NULL), NULL, NULL),
-    *
-FROM 
-(
-    SELECT dummy AS val
-    FROM system.one
-) AS s1
-ANY LEFT JOIN 
-(
-    SELECT toLowCardinality(toNullable(dummy)) AS rval
-    FROM system.one
-) AS s2 ON (val + 100) = (rval * 7)
-```
-In principle, we could add automated test case minification by modifying AST in the same vein with fuzzing. This is somewhat complicated by the fact that the server dies after every, excuse my pun, successfully failed query, so we didn't implement it yet.
-
-Not all errors the fuzzer finds are significant, some of them are pretty boring and harmless, such as a wrong error code for an out-of-bounds argument. We still try to fix all of them, because this lets us ensure that under normal operation, the fuzzer doesn't find any errors.  This is similar to the approach usually taken with compiler warnings and other optional diagnostics &mdash; it's better to fix or disable every single case, so that you can be sure you have no diagnostics if everything is OK, and it's easy to notice new problems.
-
-After fixing the majority of pre-existing error, this fuzzer became efficient for finding errors in new features. Pull requests introducing new features normally add an SQL test, and we pay extra attention to the new tests when fuzzing, generating more permutations for them. Even if the coverage of the test is not sufficient, there is a good chance that the fuzzer will find the missing corner cases. So when we see that all the fuzzer runs in different configurations have failed for a particular pull request, this almost always means that it introduces a new bug. When developing a feature that requires new grammar, it is also helpful to add fuzzing support for it. I did this for window functions early in the development, and it helped me find several bugs.
-
-A major factor that makes fuzzing really efficient for us is that we have a lot of assertions and other checks of program logic in our code. For debug-only checks, we use the plain `assert` macro from `<cassert>`. For checks that are needed even in release mode, we use an exception with a special code `LOGICAL_ERROR` that signifies an internal program error. We did some work to ensure that these errors are distinct from errors caused by the wrong user actions. A user error reported for a randomly generated query is normal (e.g.  it references some non-existent columns), but when we see an internal program error, we know that it's definitely a bug, same as an assertion. Of course, even without assertions, you get some checks for memory errors provided by the OS (segfaults). Another way to add runtime checks to your program is to use some kind of sanitizer. We already run most of our tests under clang's Address, Memory, UndefinedBehavior and Thread sanitizers. Using them in conjunction with this fuzzer also proved to be very efficient.
-
-To see for yourself how the fuzzer works, you only need the normal ClickHouse client.  Start `clickhouse-client --query-fuzzer-runs=100`, enter any query, and enjoy the client going crazy and running a hundred of random queries instead. All queries from the current session become a source for expressions for fuzzing, so try entering several different queries to get more interesting results. Be careful not to do this in production! When you do this experiment, you'll soon notice that the fuzzer tends to generate queries that take very long to run. This is why for the CI fuzzer runs we have to configure the server to limit query execution time, memory usage and so on using the corresponding [server settings](/docs/en/operations/settings/query-complexity/#:~:text=In%20the%20default%20configuration%20file,query%20within%20a%20single%20server.). We had a hilarious situation after that: the fuzzer figured out how to remove the limits by generating a `SET max_execution_time = 0` query, and then generated a never-ending query and failed. Thankfully we were able to defeat its cleverness by using [settings constraints](/docs/en/operations/settings/constraints-on-settings/).
-
-## Other Fuzzers
-
-The AST-based fuzzer we discussed is only one of the many kinds of fuzzers we have in ClickHouse. There is a [talk](https://www.youtube.com/watch?v=GbmK84ZwSeI&t=4481s) (in Russian, [slides are here](https://presentations.clickhouse.com/cpp_siberia_2021/)) by Alexey Milovidov that explores all the fuzzers we have. Another interesting recent development is application of pivoted query synthesis technique, implemented in [SQLancer](https://github.com/sqlancer/sqlancer), to ClickHouse.  The authors are going to give [a talk about this](https://heisenbug-piter.ru/2021/spb/talks/nr1cwknssdodjkqgzsbvh/) soon, so stay tuned.
diff --git a/website/blog/en/2021/how-to-enable-predictive-capabilities-in-clickhouse-databases.md b/website/blog/en/2021/how-to-enable-predictive-capabilities-in-clickhouse-databases.md
deleted file mode 100644
index a73f6dcf91d..00000000000
--- a/website/blog/en/2021/how-to-enable-predictive-capabilities-in-clickhouse-databases.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: 'How to Enable Predictive Capabilities in Clickhouse Databases'
-image: 'https://blog-images.clickhouse.com/en/2021/mindsdb-enables-predictive-capabilities-in-clickHouse/featured.png'
-date: '2021-12-14'
-author: 'Ilya Yatsishin'
-tags: ['company', 'how-to', 'MindsDB']
----
-
-ClickHouse is a fast, open-source, column-oriented SQL database that is very useful for data analysis and real-time analytics and with MindsDB can be turned into a powerful machine learning platform for business forecasting.
-
-In this article, we will
-- Guide you through the machine learning workflow and how to use ClickHouse’s powerful tools, like materialized views, to better and more effectively handle data cleaning and preparation - especially for the large datasets with billions of rows of data,
-- Explore the concept of AI Tables from MindsDB and how they can be used within ClickHouse to automatically build predictive models and make forecasts using simple SQL statements, and
-- Share how MindsDB automates really complex machine learning tasks, like multivariate time-series analysis with high cardinality, show how to detect anomalies, and visualize these predictions.
-
-[Read Further](https://mindsdb.com/blog/enabling-predictive-capabilities-in-clickhouse-database/?utm_medium=referral&utm_source=clickhouse&utm_campaign=clickhouse-ml-article-2021-12)
diff --git a/website/blog/en/2021/performance-test-1.md b/website/blog/en/2021/performance-test-1.md
deleted file mode 100644
index 1564b1c8a76..00000000000
--- a/website/blog/en/2021/performance-test-1.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-title: 'Testing the Performance of ClickHouse'
-image: 'https://blog-images.clickhouse.com/en/2021/performance-testing-1/chebu-crop.jpg'
-date: '2021-08-19'
-author: 'Alexander Kuzmenkov'
-tags: ['testing', 'performance']
----
-
-One of the main selling points of ClickHouse is that it's very fast, in many cases utilizing the hardware up to the theoretical limits. This was noted by many independent benchmark such as [this one](http://brandonharris.io/redshift-clickhouse-time-series/). This speed boils down to a right combination of architectural choices and algorithmic optimizations, sprinkled with a dash of pixie dust. There is an [overview of these factors](/docs/en/faq/general/why-clickhouse-is-so-fast) on our website, or a talk by the ClickHouse lead developer Alexey Milovidov ["The secrets of ClickHouse performance optimizations"](https://www.youtube.com/watch?v=ZOZQCQEtrz8). But this is a static picture of "how the things are". Software is a living and changing organism, and ClickHouse is changing very fast &mdash; to give you a scale, in July 2021 we merged 319 pull requests made by 60 different authors ([live statistics here](https://gh-api.clickhouse.com/play?user=play#c2VsZWN0IGRhdGVfdHJ1bmMoJ21vbnRoJywgY3JlYXRlZF9hdCkgbW9udGgsIHVuaXEoY3JlYXRvcl91c2VyX2xvZ2luKSBhdXRob3JzLCB1bmlxKG51bWJlcikgcHJzIGZyb20gZ2l0aHViX2V2ZW50cyB3aGVyZSByZXBvX25hbWUgPSAnQ2xpY2tIb3VzZS9DbGlja0hvdXNlJyBhbmQgbm90IGhhc0FueShsYWJlbHMsIFsncHItYmFja3BvcnQnLCAncHItZG9jdW1lbnRhdGlvbicsICdwci1jaGVycnlwaWNrJ10pIGFuZCBtZXJnZWQgYW5kIGNyZWF0ZWRfYXQgYmV0d2VlbiAnMjAyMC0wOS0wMScgYW5kICcyMDIxLTA5LTAxJyBncm91cCBieSBtb250aA==)). Any quality that is not actively selected for is going to be lost in this endless stream of changes, and the performance is no exception. For this reason, we have to have some process that allows us to ensure than ClickHouse always stays fast.
-
-# Measuring and Comparing the Performance
-
-How do we know it is fast, in the first place? We do a lot of benchmarks, many kinds of them. The most basic kind of a benchmark is a micro-benchmark, that doesn't use the full code of the server and tests a particular algorithm in isolation. We use them to choose a better inner loop for some aggregate function, or to test various layouts of hash tables, and so on. For example, when we discovered that a competing database engine completes a query with `sum` aggregate function twice as fast, we tested a couple of dozen implementations of `sum` to ultimately find the one that gives the best performance (see [a talk](https://www.youtube.com/watch?v=MJJfWoWJq0o) about this, in Russian). But testing a particular algorithm by itself is not enough to say how the entire query is going to work. We have to also make end-to-end measurements of entire queries, often using the real production data, because the particulars of the data (e.g. the cardinality and the distribution of values) heavily influence the performance. Currently we have about 3000 end-to-end test queries organized into about 200 [tests](https://github.com/ClickHouse/ClickHouse/tree/6c4c3df96e41425185beb0c471a8dde0ce6f25a7/tests/performance). Many of them use real data sets, such as the [production data of Yandex.Metrica](/docs/en/getting-started/example-datasets/metrica/), obfuscated with `clickhouse-obfuscator` as described [here](https://habr.com/ru/company/yandex/blog/485096/).
-
-Micro-benchmarks are normally ran by a developer while working on the code, but it is not practical to manually run the entire battery of the end-to-end tests for each change. We use an automated system that does this for each pull request as part of continuous integration checks. It measures whether the code changes introduced by a pull request influenced the performance, for which kinds of queries and by how much, and alerts the developer if there is a regression. Here is how a typical report looks.
-
-<img src="https://blog-images.clickhouse.com/en/2021/performance-testing-1/report.png"/>
-
-To talk about "changes in performance", we first have to measure this performance. The most natural measure for a single query is elapsed time. It is susceptible to random variations, so we have to take several measurements and average them in some way. From the application point of view, the most interesting statistic is maximum. We want to guarantee that e.g. an analytical dashboard built on ClickHouse is responsive. However, the query time can grow almost without limit due to random factor such as sudden disk load spikes or network delays, so using the maximum is not practical. The minimum is also interesting &mdash; after all, there is a theoretical bound on it. We know that the particular algorithm can run only so fast on the particular hardware, in ideal conditions. But if we only look at the minimum, we are going to miss cases where some runs of the query are slow and some are not (e.g. boundary effects in some cache). So we compromise by measuring the median. It is a robust statistic that is reasonably sensitive to outliers and stable enough against noise.
-
-After measuring the performance, how do we determine that it has changed? Due to various random and systematic factors, the query time always drifts, so the number always changes, but the question is whether this change is meaningful. If we have an old version of the server, and a new version of the server, are they going to consistently give a different result for this query, or was it just a fluke? To answer this, we have to employ some statistical method. The core idea of these methods is comparing the observed values to some reference distribution, and deciding whether what we observed can plausibly belong to this distribution, or, on the contrary, it cannot, which means that the performance characteristics of the patched server are indeed different.
-
-Choosing the reference distribution is the starting point. One way to obtain it is to build a mathematical model of the process. This works well for simple things like tossing a coin a fixed number of times. We can analytically deduce that the number of heads we get follows the binomial distribution, and get a confidence interval on this number, given the required [level of significance](https://en.wikipedia.org/wiki/P-value#Definition_and_interpretation). If the observed number of heads doesn't belong to this interval, we can conclude that the coin is biased. However, modeling the query execution from first principles is too complex. The best we can do is to use the hardware capabilities to estimate how fast the query could run, in principle, and try to achieve this throughput.
-
-For complex processes which resist modeling, a practical option is to use the historical data from the same process. We actually used to do this for ClickHouse. For each tested commit, we measured the run times for each test query and saved them into a database. We could compare the patched server to these reference values, build graphs of changes over time and so on. The main problem with this approach is systematic errors induced by environment. Sometimes the performance testing task ends up on a machine with dying HDD, or they update `atop` to a broken version that slows every kernel call in half, et cetera, ad infinitum. This is why now we employ another approach.
-
-We run the reference version of the server process and the tested version, simultaneously on the same machine, and run the test queries on each of them in turn, one by one. This way we eliminate most systematic errors, because both servers are equally influenced by them. We can then compare the set of results we got from the reference server process, and the set from the test server process, to see whether they look the same. Comparing the distributions using two samples is a very interesting problem in itself. We use a non-parametric bootstrap method to build a randomization distribution for the observed difference of median query run times. This method is described in detail in [[1]](#ref1), where they apply it to see how changing a fertilizer mixture changes the yield of tomato plants. ClickHouse is not much different from tomatoes, only we have to check how the changes in code influence the performance.
-
-This method ultimately gives a single threshold number _T_: what is the largest difference in median query run times between old and new server, that we can observe even if nothing has changed. Then we have a simple decision protocol given this threshold _T_ and the measured difference of medians _D_:
-
-1. _abs(D) <= T_ &mdash; the changes are not statistically significant,
-2. _abs(D) <= 5%_ &mdash; the changes are too small to be important,
-3. _abs(T) >= 10%_ &mdash; the test query has excessive run time variance that leads to poor sensitivity,
-4. finally, _abs(D) >= T and abs(D) >= 5%_ &mdash; there are statistically significant changes of significant magnitude.
-
-The most interesting case are the unstable queries _(3)_. When the elapsed time changes significantly between runs even on the same version of server, it means we won't be able to detect the changes of performance, because they are going to be drowned out by the noise. Such queries tend to be the most difficult to debug, because there is no straightforward way to compare "good" and "bad" server. This topic deserves its own article which we will publish next. For now, let's consider the happy path _(4)_. This is the case of real and notable changes in performance that this system is intended to catch. What do we do next?
-
-# Understanding the Reasons Behind the Changes
-
-An investigation of code performance often starts with applying a profiler. On Linux, you would use `perf`, a sampling profiler that periodically collects the stack trace of the process, so that you can then see an aggregate picture of where your program spends the most time. In ClickHouse, we actually have a built-in sampling profiler that saves results into a system table, so no external tools are needed. It can be enabled for all queries or for a particular one, by passing the settings [as described in the docs](/docs/en/operations/optimizing-performance/sampling-query-profiler/). It is on by default, so if you use a recent version of ClickHouse, you already have a combined profile of your production server load. To visualize it, we can use a well-known script for building [flamegraphs](https://github.com/brendangregg/FlameGraph):
-```
-clickhouse-client -q "SELECT
-    arrayStringConcat(
-        arrayMap(
-            x -> concat(splitByChar('/', addressToLine(x))[-1],
-                '#', demangle(addressToSymbol(x))),
-            trace),
-        ';') AS stack,
-    count(*) AS samples
-FROM system.trace_log
-WHERE trace_type = 'Real'
-AND query_id = '4aac5305-b27f-4a5a-91c3-61c0cf52ec2a'
-GROUP BY trace" \
-| flamegraph.pl
-
-```
-
-As an example, let's use the test run we've seen above. The tested [pull request](https://github.com/ClickHouse/ClickHouse/pull/26248) is supposed to speed up the `sum` aggregate function for nullable integer types. Let's look at the query #8 of the test 'sum': `SELECT sum(toNullable(number)) FROM numbers(100000000)`. The test system reported that its performance increased by 38.5%, and built a "differential" variant of flamegraph for it, that shows the relative time spent in different functions. We can see that the function that calculates the sum, `DB::AggregateFunctionSumData<unsigned long>::addManyNotNull<unsigned long>`, now takes 15% less time.
-
-<object data="https://blog-images.clickhouse.com/en/2021/performance-testing-1/sum-8-diff.svg" type="image/svg+xml" width="100%"/>
-
-To get more leads into why the performance has changed, we can check how the various query metrics have changed between the old and the new servers. This includes all the metrics from `system.query_log.ProfileEvents`, such as `SelectedRows` or `RealTimeMicroseconds`. ClickHouse also tracks the hardware CPU metrics such as the number of branch or cache misses, using the Linux `perf_event_open` API. After downloading the test output archive, we can use a simple ad hoc [script](https://gist.github.com/akuzm/bb28a442f882349e0a5ec2b5262b97d0) to build some statistics and graphs of these metrics.
-
-<img src="https://blog-images.clickhouse.com/en/2021/performance-testing-1/sum_8_scatter_2d_PerfBranchInstructions_per_client_time.png"/>
-
-This graph shows the number of branch instructions per second, on the old and the new server. We can see that the number of branch instructions has dramatically decreased, which might explain the performance difference. The tested pull request removes some `if`s and replaces them with multiplication, so this explanation sounds plausible.
-
-While side-to-side comparison is more robust against the systemic errors, the historical data is still very valuable for finding where a regression was introduced or investigating the unstable test queries. This is why we save the results of all test runs into a ClickHouse database. Let's consider the same query #8 from the `sum` test. We can build the history of performance changes with this [SQL query](https://play-ci.clickhouse.com/play?user=play#V0lUSCAwLjA1IEFTIHMKU0VMRUNUIG9sZF9zaGEsIG5ld19zaGEsIGV2ZW50X3RpbWUsIG1lc3NhZ2UsIG9sZF92YWx1ZSBBUyBgb2xkIHNlcnZlcmAsICAgbmV3X3ZhbHVlIEFTIGBuZXcgc2VydmVyYCwgYmVmb3JlIEFTIGBwcmV2IDExIHJ1bnNgLCBhZnRlciBBUyBgbmV4dCAxMSBydW5zYCwgICAgZGlmZiBBUyBgZGlmZiwgcmF0aW9gLCBzdGF0X3RocmVzaG9sZF9oaXN0b3JpY2FsIEFTIGBzdGF0IHRocmVzaG9sZCwgcmF0aW8sIGhpc3RvcmljYWxgLCBzdGF0X3RocmVzaG9sZCBBUyBgc3RhdCB0aHJlc2hvbGQsIHJhdGlvLCBwZXItcnVuYCwgY3B1X21vZGVsLHF1ZXJ5X2Rpc3BsYXlfbmFtZQpGUk9NIAooU0VMRUNUICosIHJ1bl9hdHRyaWJ1dGVzX3YxLnZhbHVlIEFTIGNwdV9tb2RlbCwKICAgICAgICBtZWRpYW4ob2xkX3ZhbHVlKSBPVkVSIChQQVJUSVRJT04gQlkgcnVuX2F0dHJpYnV0ZXNfdjEudmFsdWUsIHRlc3QsIHF1ZXJ5X2luZGV4LCBxdWVyeV9kaXNwbGF5X25hbWUgT1JERVIgQlkgZXZlbnRfZGF0ZSBBU0MgUk9XUyBCRVRXRUVOIDExIFBSRUNFRElORyBBTkQgQ1VSUkVOVCBST1cpIEFTIGJlZm9yZSwKICAgICAgICBtZWRpYW4obmV3X3ZhbHVlKSBPVkVSIChQQVJUSVRJT04gQlkgcnVuX2F0dHJpYnV0ZXNfdjEudmFsdWUsIHRlc3QsIHF1ZXJ5X2luZGV4LCBxdWVyeV9kaXNwbGF5X25hbWUgT1JERVIgQlkgZXZlbnRfZGF0ZSBBU0MgUk9XUyBCRVRXRUVOIENVUlJFTlQgUk9XIEFORCAxMSBGT0xMT1dJTkcpIEFTIGFmdGVyLAogICAgICAgIHF1YW50aWxlRXhhY3QoMC45NSkoYWJzKGRpZmYpKSBPVkVSIChQQVJUSVRJT04gQlkgcnVuX2F0dHJpYnV0ZXNfdjEudmFsdWUsIHRlc3QsIHF1ZXJ5X2luZGV4LCBxdWVyeV9kaXNwbGF5X25hbWUgT1JERVIgQlkgZXZlbnRfZGF0ZSBBU0MgUk9XUyBCRVRXRUVOIDM3IFBSRUNFRElORyBBTkQgQ1VSUkVOVCBST1cpIEFTIHN0YXRfdGhyZXNob2xkX2hpc3RvcmljYWwKICAgIEZST00gcGVyZnRlc3QucXVlcnlfbWV0cmljc192MgogICAgTEVGVCBKT0lOIHBlcmZ0ZXN0LnJ1bl9hdHRyaWJ1dGVzX3YxIFVTSU5HIChvbGRfc2hhLCBuZXdfc2hhKQogICAgV0hFUkUgKGF0dHJpYnV0ZSA9ICdsc2NwdS1tb2RlbC1uYW1lJykgQU5EIChtZXRyaWMgPSAnY2xpZW50X3RpbWUnKQogICAgICAgIC0tIG9ubHkgZm9yIGNvbW1pdHMgaW4gbWFzdGVyCiAgICAgICAgQU5EIChwcl9udW1iZXIgPSAwKQogICAgICAgIC0tIHNlbGVjdCB0aGUgcXVlcmllcyB3ZSBhcmUgaW50ZXJlc3RlZCBpbgogICAgICAgIEFORCAodGVzdCA9ICdzdW0nKSBBTkQgKHF1ZXJ5X2luZGV4ID0gOCkKKSBBUyB0CkFOWSBMRUZUIEpPSU4gYGdoLWRhdGFgLmNvbW1pdHMgT04gbmV3X3NoYSA9IHNoYQpXSEVSRQogICAgLS0gQ2hlY2sgZm9yIGEgcGVyc2lzdGVudCBhbmQgc2lnbmlmaWNhbnQgY2hhbmdlIGluIHF1ZXJ5IHJ1biB0aW1lLCBpbnRyb2R1Y2VkIGJ5IGEgY29tbWl0OgogICAgLS0gMSkgb24gYSBoaXN0b3JpY2FsIGdyYXBoIG9mIHF1ZXJ5IHJ1biB0aW1lLCB0aGVyZSBpcyBhIHN0ZXAgYmV0d2VlbiB0aGUgYWRqYWNlbnQgY29tbWl0cywKICAgIC0tIHRoYXQgaXMgaGlnaGVyIHRoYW4gdGhlIG5vcm1hbCB2YXJpYW5jZSwKICAgICgoKGFicyhhZnRlciAtIGJlZm9yZSkgLyBpZihhZnRlciA+IGJlZm9yZSwgYWZ0ZXIsIGJlZm9yZSkpIEFTIHN0ZXBfaGVpZ2h0KSA+PSBncmVhdGVzdChzLCBzdGF0X3RocmVzaG9sZF9oaXN0b3JpY2FsKSkKICAgIC0tIDIpIGluIHNpZGUtdG8tc2lkZSBjb21wYXJpc29uIG9mIHRoZXNlIHR3byBjb21taXRzLCB0aGVyZSB3YXMgYSBzdGF0aXN0aWNhbGx5IHNpZ25pZmljYW50IGRpZmZlcmVuY2UKICAgIC0tIHRoYXQgaXMgYWxzbyBoaWdoZXIgdGhhbiB0aGUgbm9ybWFsIHZhcmlhbmNlLAogICAgICAgIEFORCAoYWJzKGRpZmYpID49IGdyZWF0ZXN0KHN0YXRfdGhyZXNob2xkLCBzdGF0X3RocmVzaG9sZF9oaXN0b3JpY2FsLCBzKSkKICAgIC0tIDMpIGZpbmFsbHksIHRoaXMgc2lkZS10by1zaWRlIGRpZmZlcmVuY2UgaXMgb2YgbWFnbml0dWRlIGNvbXBhcmFibGUgdG8gdGhlIHN0ZXAgaW4gaGlzdG9yaWNhbCBncmFwaHMuCiAgICAgICAgQU5EIChhYnMoZGlmZikgPj0gKDAuNyAqIHN0ZXBfaGVpZ2h0KSkKb3JkZXIgYnkgZXZlbnRfdGltZSBkZXNjCmZvcm1hdCBWZXJ0aWNhbAoKCg==) to the live ClickHouse CI database. Open the link and run the query so that you can examine the query and see the result for yourself. There were three significant changes of performance throughout the test history. The most recent is a speedup in PR we started with. The second speedup is related to fully switching to clang 11. Curiously, there is also a small slowdown introduced by a PR that was supposed to speed it up instead.
-
-# Usability Considerations
-
-Regardless of how it works inside, a test system must be actually usable as a part of the development process. First and foremost, the false positive rate should be as low as possible. False positives are costly to investigate, and if they happen often, developers perceive the test as generally unreliable and tend to ignore the true positives as well. The test must also provide a concise report that makes it obvious what went wrong. We have not really succeeded in this. This test has many more failure modes than a plain functional test, and worse, some of these failures are quantitative, not binary. Much of the complexity is essential, and we try to alleviate it by providing good documentation and linking to the relevant parts of it right from the report page. Another important thing is that the user must be able to investigate a problematic query post-mortem, without running it again locally. This is why we try to export every metric and every intermediate result we have, in easily-manipulated plain text formats.
-
-Organizationally, it is hard to prevent devolving into a system that does a lot of busywork to just show a green check without giving any insight. I like to call this process "mining the green check", by analogy to cryptocurrencies. Our previous system did just that. It used increasingly complex heuristics tailored to each test query to prevent false positives, restarted itself many times if the results didn't look good, and so on. Ultimately, it wasted a lot of processing power without giving the real picture of the server performance. If you wanted to be sure that the performance did or did not change, you had to recheck by hand. This sorry state is the result of how the incentives are aligned around development &mdash; most of the time, the developers just want to merge their pull requests and not be bothered by some obscure test failures. Writing a good performance test query is also not always simple. Just any other query won't do &mdash; it has to give predictable performance, be not too fast and not too slow, actually measure something, and so on. After gathering more precise statistics, we discovered that several hundred of our test queries don't measure anything meaningful, e.g. they give a result that varies by 100% between runs. Another problem is that the performance often changes in statistically significant ways (true positive) with no relevant code changes (due to e.g. random differences in layout of the executable). Given all these difficulties, a working performance test system is bound to add noticeable friction to the development process. Most of the "obvious" ways to remove this friction ultimately boil down to "mining the green check".
-
-Implementation-wise, our system is peculiar in that it doesn't rely on well-known statistical packages, but instead heavily uses `clickhouse-local`, a tool that turns the ClickHouse SQL query processor into a command line utility Doing all the computations in ClickHouse SQL helped us find bugs and usability problems with `clickhouse-local`. The performance test continues to work in dual purpose as a heavy SQL test, and sometimes catches newly introduced bugs in complex joins and the like. The query profiler is always on in the performance tests, and this finds bugs in our fork of `libunwind`. To run the test queries, we use a third-party [Python driver](https://github.com/mymarilyn/clickhouse-driver). This is the only use of this driver in our CI, and it also helped us find some bugs in native protocol handling. A not so honorable fact is that the scaffolding consists of an unreasonable amount of bash, but this at least served to convince us that running [shellcheck](https://github.com/koalaman/shellcheck) in CI is very helpful.
-
-This concludes the overview of the ClickHouse performance test system. Stay tuned for the next article where we will discuss the most problematic kind of a performance test failure &mdash; the unstable query run time.
-
-_2021-08-20 [Alexander Kuzmenkov](https://github.com/akuzm). Title photo by [Alexander Tokmakov](https://github.com/tavplubix)_
-
-References:
-
-<a id="ref1"/>1. Box, Hunter, Hunter, 2005. Statistics for experimenters, p. 78: A Randomized Design Used in the Comparison of Standard and Modified Fertilizer Mixtures for Tomato Plants.
diff --git a/website/blog/en/2021/plausible-uses-clickHouse-to-power-privacy-friendly-google-analytics-alternative.md b/website/blog/en/2021/plausible-uses-clickHouse-to-power-privacy-friendly-google-analytics-alternative.md
deleted file mode 100644
index f462f9b3990..00000000000
--- a/website/blog/en/2021/plausible-uses-clickHouse-to-power-privacy-friendly-google-analytics-alternative.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: 'Plausible Analytics uses ClickHouse to power their privacy-friendly Google Analytics alternative'
-image: 'https://blog-images.clickhouse.com/en/2021/plausible-uses-clickHouse-to-power-privacy-friendly-google-analytics-alternative/featured-cropped.jpg'
-date: '2021-12-08'
-author: 'Elissa Weve'
-tags: ['company']
----
-
-Plausible Analytics is a lightweight, open source web analytics tool that has quickly gained popularity as the privacy-friendly alternative to Google Analytics. By using Plausible Analytics, customers keep 100% ownership of their website data and protect the privacy of their visitors since there are no cookies and it is fully compliant with GDPR.
-
-Since its launch in April 2019, the analytics platform has scaled to service 5000+ paying subscribers. With an annual recurring revenue of half a million dollars, Plausible Analytics currently tracks 28,000 different websites and more than 1 billion page views per month.
-
-Marko Saric, co-founder at Plausible Analytics, said to handle this increase in volume, it became clear early on that the original architecture using Postgres to store analytics data could not handle the platform’s future growth. 
-
-“We knew that if we’re going to go anywhere in the future we needed something better,” Saric said.
-
-## “Best technical decision we ever made”
-
-Through word of mouth, the Plausible team received the recommendation to try ClickHouse. They quickly noticed significant improvements in the loading speed of their dashboards. With Postgres, their dashboards were taking 5 seconds to load; Now with ClickHouse, it took less than a second. 
-
-Plausible co-founder Uku Täht said the team also tried a couple of other solutions, but “Clickhouse came on top in terms of both performance and features that we would make use of,” he said.
-
-“Plausible Analytics is a lightweight product, so it is important that everything loads quickly—the dashboard, segmentation of the data, and all the cool stuff in the background. Customers don’t know what we’re doing in the background, but they know that they want a fast experience,” Saric added.
-
-“Plausible Analytics is a lightweight product, so it is important that everything loads quickly—the dashboard, segmentation of the data, and all the cool stuff in the background. Customers don’t know what we’re doing in the background, but they know that they want a fast experience,” Saric added. Using ClickHouse, Plausible Analytics is able to serve even its largest customers with ease, including the biggest customer, with 150 million pages per month. “This would not have been possible previously, it would have crashed everything, it would not have been able to load.,” Saric said. “There would have been no chance we could have had that kind of customer.”
-
-According to Täht, switching to ClickHouse was the best technical decision their team ever made. “Clickhouse is amazingly efficient, not just in terms of compute power needed but also the time that it saves us. It's very easy to work with Clickhouse. It does exactly what we need and it does it exceptionally well. It's one of those technologies that feels really simple to use but also has a rich feature set.”
-
-“I don’t think we would be able to be where we are today without ClickHouse,” Saric said. “Without switching from Postgres, Plausible would not have all this growth and new customers.”
-
-## About Plausible
-
-Plausible Analytics is an open-source project dedicated to making web analytics more privacy-friendly. Our mission is to reduce corporate surveillance by providing an alternative web analytics tool which doesn’t come from the AdTech world.
-
-Visit [plausible.io](https://plausible.io/) for more information or to start a free trial.
-
-
diff --git a/website/blog/en/2021/reading-from-external-memory.md b/website/blog/en/2021/reading-from-external-memory.md
deleted file mode 100644
index 01d35d19018..00000000000
--- a/website/blog/en/2021/reading-from-external-memory.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: 'A journey to io_uring, AIO and modern storage devices'
-image: 'https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/all-single-read.png'
-date: '2021-03-09'
-author: 'Ruslan Savchenko'
-tags: ['Linux', 'benchmark', 'experiment']
----
-
-*While main memory is considered to be rather cheap by some systems designers it is not always possible to store everything in the main memory. When data is stored in external memory one has to think carefully how to access the data. There are several kind of storage devices and more than one system call to read from them. We performed experiments to find out how different Linux system calls perform for available devices. In total HDD, SATA SSD, NVMe SSD, and Intel Optane were accessed via single-threaded and multi-threaded pread, Linux aio, and new io_uring interfaces. Full report is available in PDF format:* [link](https://arxiv.org/pdf/2102.11198). *We give one section from the report as an example.*
-
-# Single Random Read
-
-External memory devices are block devices which means data transfer between a device and a host is done in blocks rather than single bytes. Typically 512 bytes or 4 kilobytes blocks are used. These block sizes have been chosen by manufactures long time ago and may be not the best choice for modern devices. By requesing larger amount of contigious data we can emulate larger block size. Let's find out how modern devices perform with larger blocks.
-
-Our goal is to pick the best block size for a random read. An application (or filesystem) can pick any block size and access data with respect to this block size. We vary block size from 4 kilobytes up to 32 megabytes. For each block size we make some random reads. Among these reads we calculate average, minimum and maximum latency as well as 99,0 and 99,9 percentiles. We use system call pread(2) in this experiment. We believe that lseek(2) followed by read(2) should have the same performance since the observed storage access time is far longer than a system call.
-
-## Hard Disk Drive
-
-This figure shows results for HDD.
-
-![HDD single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/hdd-single-read.png)
-
-The latency is almost the same for all block sizes smaller than 256 kilobytes. This happens because seek time is much larger than the data transfer time. The seek time includes arm positioning to find the right track and awaiting for platter rotation to bring data under the head. A simple consequence is that for a HDD random read one should use blocks of size at least 256 kilobytes. Even if an application use smaller blocks the drive access time would be the same. However one could still decide to use smaller blocks for better cache utilization: if the amount of data per request is small and is expected to fit in cache then storing a large block along with the requested data would actually make cache capacity smaller in terms of useful data.
-
-The 256 kilobyte block read takes 12 milliseconds on the average. We experienced variations from 4 milliseconds up to 25 milliseconds.  This is really a huge amount of time for a computer. For example the typical process scheduling quantum is just a few milliseconds. An operating system can (and in fact does) execute other processes while our process waits for the data to arrive from the hard drive.
-
-## SATA SSD
-
-The figure below shows SATA SSD read latencies.
-
-![SATA SSD single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/ssd-single-read.png)
-
-Note that the time at the lower part of the figure is in microseconds (we use standard shortenings ms for milliseconds and us for microseconds). Reading block of size 4 kilobytes takes 140 microseconds on the average and the time growth is linear when the block size increase. Compared to HDD reading a 4 kilobyte block from SSD is 80 times faster. For a 256 kilobyte block SSD is ten times faster than HDD. When block size is large enough (starting from 4 megabytes) SSD is only two times faster than HDD.
-
-## NVMe SSD
-
-The next figure shows results for NVMe SSD.
-
-![NVMe SSD single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/nvme-single-read.png)
-
-The latency is better than those for SATA SSD. For a 4 kilobytes block size the average time improved only a little, but the 99 percentile is two times lower. It takes less than millisecond to read a megabyte block from NVMe SSD. For SATA SSD it took 3 milliseconds. As we see, upgrade from SATA SSD to NVMe SSD is not as dramatic as upgrade from HDD to SATA SSD. This is not surprising since both SATA and NVMe SSD are based on the same thechnology. Only interfaces differ.
-
-## Intel Optane
-
-This figure shows results for Intel Optane SSD.
-
-![Intel Optane single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/optane-single-read.png)
-
-Minimal latency is 12 microseconds whih is 10 times lower than those of NVMe SSD. Average latency is 1000 lower than those of HDD. There is quite large variation for small block read latency: even though the average time is quite low and close to minimal latency the maximum latency and even 99 percentile are significantly worse. If somebody looks at these results and wishes to create an Intel Optane-based service with 12 microsecond latency for reads they would have to install larger number of Intel Optane drives or consider providing more realistic timings.
-
-When latency is so small overheads of context switching and interrupt handling become noticeable. One can use polling mode to gain some improvement. In this mode the Linux kernel monitors the completion queue instead of switching to some other job and relying on hardware interrupt with interrupt handler to notify about completion. Clearly, it is considerable to use the polling mode only when hardware response is expected to arrive fast enough.
-
-![Intel Optane single read latency in polling mode](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/optane-single-hipri-read.png)
-
-The figure above shows results for reading from Intel Optane in polling mode. The polling mode is used when an application calls preadv2(2) system call with RWF\_HIGHPRI flag. Compared to usual pread(2) the polling mode lowers the maximum latency by a factor of two for block sizes up to 256 kilobytes.
-
-## Summary
-
-To summarize our results the next figure shows single read latencies for all four storage types on a single chart.
-
-![Single read latency for Optane, SSD and HDD](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/all-single-read.png)
-
-Starting from 4 megabytes the latency is easily predicted by linear extrapolation so we don't show larger blocks here. To show everything on a single figure we are forced to use quite an overloaded legend. We use vertical level to show the latency and we iterate the block size horizontally. For each block size we show four bars, from left to right: for Intel Optane, NVMe SSD, SATA SSD, and HDD. Storage type is represented by hatch and the latency by color.
-
-We see that solid state device latencies are far better than HDD. For a single read the leader is Intel Optane, however as we shall see later it has it's own drawback compared to NVMe SSD. NVMe SSD and SATA SSD look quite close to each other when the block size is small. Our observations show that the best block size for random read is 256 kilobytes for HDD, 4 kilobytes for NVMe and SATA SSD and 8 kilobytes for Intel Optane.
-
-So, how about testing modern IO interfaces in Linux? Continue reading the [full article](https://arxiv.org/pdf/2102.11198).
-
-2021-03-09 [Ruslan Savchenko](https://github.com/savrus)
diff --git a/website/blog/en/2021/tests-visualization.md b/website/blog/en/2021/tests-visualization.md
deleted file mode 100644
index 8b927f8976a..00000000000
--- a/website/blog/en/2021/tests-visualization.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: 'Decorating a Christmas Tree With the Help Of Flaky Tests'
-image: 'https://blog-images.clickhouse.com/en/2021/tests-visualization/tests.png'
-date: '2021-12-27'
-author: 'Alexey Milovidov'
-tags: ['tests', 'ci', 'flaky', 'christmas', 'visualization']
----
-
-Test suites and testing infrastructure are one of the main assets of ClickHouse. We have tons of functional, integration, unit, performance, stress and fuzz tests. Tests are run on a per commit basis and results are publicly available.
-
-We also save the results of all test runs into the database in ClickHouse. We started collecting results in June 2020, and we have 1 777 608 240 records so far. Now we run around 5 to 9 million tests every day.
-
-Tests are good (in general). A good test suite allows for fast development iterations, stable releases, and to accept more contributions from the community. We love tests. If there's something strange in ClickHouse, what are we gonna do? Write more tests.
-
-Some tests can be flaky. The reasons for flakiness are uncountable - most of them are simple timing issues in the test script itself, but sometimes if a test has failed one of a thousand times it can uncover subtle logic errors in code.
-
-The problem is how to deal with flaky tests. Some people suggest automatically muting the "annoying" flaky tests. Or adding automatic retries in case of failure. We believe that this is all wrong. Instead of trying to ignore flaky tests, we do the opposite: we put maximum effort into making the tests even more flaky!
-
-Our recipes for flaky tests:
-— never mute or restart them; if the test failed once, always look and investigate the cause;
-— randomize the environment for every test run so the test will have more possible reasons to fail;
-— if new tests are added, run them 100 times and if at least one fails, do not merge the pull request;
-— if new tests are added, use them as a corpus for fuzzing - it will uncover corner cases even if author did not write tests for them;
-— [randomize thread scheduling](https://github.com/ClickHouse/ClickHouse/blob/master/src/Common/ThreadFuzzer.h) and add random sleeps and switching between CPU cores at random places and before and after mutex locks/unlocks;
-— run everything in parallel on slow machines;
-
-Key point: to prevent flaky tests, we make our tests as flaky as possible.
-
-## Nice Way To Visualize Flaky Tests
-
-There is a test suite named "[functional stateless tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/queries/0_stateless)" that has 3772 tests. For every day since 2020-06-13 (561 days) and every test (3772 tests), I drew a picture of size 561x3772 where a pixel is green if all test runs finished successfully in the master branch during this day (for all commits and all combinations: release, debug+assertions, ASan, MSan, TSan, UBSan), and a pixel is red if at least one run failed. The pixel will be transparent if the test did not exist that day.
-
-This visualization is a toy that I've made for fun:
-
-![Visualization](https://blog-images.clickhouse.com/en/2021/tests-visualization/tree_half.png)
-
-It looks like a Christmas Tree (you need a bit of imagination). If you have a different kind of imagination, you can see it as a green field with flowers.
-
-The time is from left to right. The tests are numbered with non-unique numbers (new tests usually get larger numbers), and these numbers are on the vertical axis (newer tests on top).
-
-If you see red dots in a horizontal line - it is a flaky test. If you see red dots in a vertical line - it means that one day we accidentally broke the master branch. If you see black horizontal lines or cuts in the tree - it means that the tests were added with some old numbers, most likely because some long living feature branch was merged. If you see black vertical lines - it means that some days tests were not run.
-
-The velocity of adding new tests is represented by how tall and narrow the Christmas tree is. When we add a large number of tests, the tree grows with almost vertical slope.
-
-The image is prepared by [HTML page](https://github.com/ClickHouse/ClickHouse/pull/33185) with some JavaScript that is querying a ClickHouse database directly and writing to a canvas. It took around ten seconds to build this picture. I also prepared an [interactive version](https://blog-images.clickhouse.com/en/2021/tests-visualization/demo.html) with already-saved data where you can play and find your favorite tests.
diff --git a/website/blog/en/2022/a-mixer-aggregates-over-1-billion-unique-users-a-day-using-clickhouse.md b/website/blog/en/2022/a-mixer-aggregates-over-1-billion-unique-users-a-day-using-clickhouse.md
deleted file mode 100644
index 45a4628ed3a..00000000000
--- a/website/blog/en/2022/a-mixer-aggregates-over-1-billion-unique-users-a-day-using-clickhouse.md
+++ /dev/null
@@ -1,133 +0,0 @@
----
-title: 'Admixer Aggregates Over 1 Billion Unique Users a Day using ClickHouse'
-image: 'https://blog-images.clickhouse.com/en/2022/a-mixer-case-study/featured.jpg'
-date: '2022-01-11'
-author: 'Vladimir Zakrevsky'
-tags: ['company']
----
-
-## Highlights
-
-* Inserting around 100 billion records per day, over 1 million records per second
-* Able to aggregate over 1 billion unique users a day
-* Moved from MSSQL to Azure Table Storage to ClickHouse 
-* ClickHouse is deployed on 15 servers with 2 TB total RAM
-
-Admixer is an Ad-Tech company that provides all the components to build infrastructure for advertising products for brands, ad agencies, media houses, publishers, ad networks, and other buy- and sell-side industry players looking for effective ad management. A distinctive feature of Admixer is their technology, which allows:
-
-* Agencies to place advertising campaigns with specified execution conditions (terms, budget, creative display settings)
-* Set the rules for distributing advertising campaign budgets among thousands of publishers
-* Provide accounts for publishers, where they could not only see income statistics or withdraw money but also create their advertising campaigns, as well as connect other sources of monetization in addition to Network advertising campaigns.
-
-Admixers products include:
-
-* SSP - Supply-side platform where publishers/websites offer advertising space
-* DSP - Demand-side platform where advertisers buy advertising space
-* ADX - Ad exchange (connects SSPs and DSPs - buyers and sellers of advertisements and advertising space)
-* DMP - Data management platform (used by advertisers to configure the audience they want to target)
-
- Admixer provides not only access to these products but allows customers to build an entire ecosystem.
-
-## Why We Chose ClickHouse
-
-To implement the previous point, Admixer began developing an Advertising Exchange. Initially, AdExchange was based on the sale of local inventory by external DSPs. Then it began to aggregate the traffic of external SSPs to place local advertisements on it and later redirect this traffic to external DSPs. Thus, ADX was created.
-
-In 2015-2016, the share of external inventory was 3% (100 million requests), then at the end of 2016, it was more than 90% (3 billion requests). With a sharp increase in requests, the load on their processing increased, and most importantly, the load on the storage and provision of online analytics increased. Relational databases could not handle that many inserts for statistics records. Before migrating to Azure, we used a MSSQL server which stored the object structure and statistics.
-
-In 2011, when migrating to Azure, we used Azure Table Storage to store and issue statistics. But with an increase in the number of transactions and the amount of data, it was not optimal to use this solution since Azure Table Storage charges for the number of transactions and the amount of data.
-
-Thus we needed to:
-
-* Display statistics on advertising transactions in the user interface in real-time;
-* Accept a significant amount (1 million records per second) of data for insertion;
-* Aggregate the received data for different sections (40 operations and the same number of metrics);
-* Be able to scale the data warehouse as the number of requests grew;
-* Have full control over our costs.
-
-![Profile Report](https://blog-images.clickhouse.com/en/2022/a-mixer-case-study/profile-report.png)
-
-This image shows the Profile Report. Any Ad Campaign in Admixer is split by Line Items (Profiles). It is possible to overview detailed reports by each Profile including Date-Time Statistics, Geo, Domans, SSPs. This report is also updated in real time.
-
-## The Advantages of Using ClickHouse
-
-ClickHouse helps to cope with the challenges above and provides the following benefits:
-
-* Not tied to the platform (we decided to migrate from the cloud);
-* The cluster we built allows us to receive up to a million inserts per second (and we know how to scale up on demand);
-* Has built-in mechanisms for aggregating and distributing data across tables (materialized views);
-* Excellent data compression;
-* Reading speed makes it possible to display statistics directly in the user interface in real-time;
-* Has a SQL dialect that provides the ability to build any reports;
-* Has several advanced functions (and allows you to write your own) for processing statistics;
-* Built-in HyperLogLog for storing rough data;
-* Data sampling;
-* Open source / community / good documentation;
-* Constant additions of new features, bug fixes, and improvements to the current functionality;
-* Convenient operations.
-
-## ClickHouse Architecture
-
-Our architecture changed from 2016 to 2020. There are two diagrams below: the state we started and the state we came to.
-
-![Architecture 2016](https://blog-images.clickhouse.com/en/2022/a-mixer-case-study/architecture-2016.png)
-
-_Architecture 2016_
-
-![Architecture 2020](https://blog-images.clickhouse.com/en/2022/a-mixer-case-study/architecture-2020.png)
-
-_Architecture 2020_
-
-Requests Handler is a component that accepts a request for an advertisement and determines which banner to display. After the banner is selected, it records this in the statistics. Since 2020, these components have been receiving over 1 million requests per second. Statistics were recorded through an intermediate element named Global Events Queue. Events were retrieved from GlobalEventsQueue, read by the EventsProcessor components, and additionally validated/enriched, then written to the ClickHouse cluster.
-
-Initially, we wrote from EventsProcessor in ClickHouse into several tables in parallel but then switched through Buffer-> Null-table-> MatViews. We will next investigate if the new [asynchronous insert feature](https://clickhouse.com/blog/en/2021/clickhouse-v21.11-released/#async-inserts) in version 21.11 would be an alternative to using a buffer table.
-
-We also reviewed the implementation of the event queue. Initially, we used Redis (but Redis is InMemory storage), thus:
-
-* On server restart, there was a risk of losing events;
-* The amount of RAM is relatively small, and if we planned to stop the Events Processor or ClickHouse, there was a risk of overflowing the event queue, so a very high response rate to event processor problems was required.
-
-We tried to replace Redis and use Kafka instead, but the Kafka driver for ClickHouse at the time had issues with arrays (which has since been fixed).
-
-Therefore, we implemented our event queue, which was stored on the disk of each EventHandler component, and the local EventsProcessor was located on the same server. The number of EventsProcessor components has increased, which means that the number of insert requests in ClickHouse has also increased, but this was not a problem.
-
-Since financial optimization was also an essential factor for us, this scheme proved to be excellent in this regard as well. To receive processing and storage of data from ADX, we assembled a cluster with 15 servers (40 threads, 128 RAM, SSD storage), and we also took this with a margin. For the storage cluster for unique users, we used a cluster with 6 of the same servers. 
-
-An important point was also the work with receiving data from clusters. If you recklessly send a request to the cluster, this could create a pretty significant load on it, leading to the slowdown of other processes. But ClickHouse has settings for limiting resources and allocating quotas for specific users, which allowed us to solve this case quickly. All configuration files can be perfectly placed in the configuration management system and managed from there.
-
-## ClickHouse Handles Over 1 Billion Unique Users Per Day
-
-In addition to statistics aggregation, which summed up metrics by dimension, Admixer provides information on how many unique users have watched ads for an arbitrary time. The number of uniques cannot be summed up. In our system, the user ID is the UUID. When we want to get several unique UUIDs for some arbitrary period, we need to recalculate the unique UUIDs for this period each time. We cannot decompose all possible combinations in advance since the intersection will be too large.
-
-Before using ClickHouse, we could count uniques only for predefined periods: day, week, month, all the time. Also, the number of slices was limited. Also, constant bulk requests for Aerospike slowed down the event processor.
-
-AggregatingMergeTree allowed us with minimal costs to count unique users by a large number of keys in one report. In the beginning, with a cluster from three servers, we could easily count 1 billion uniques per day in ~ 12 slices. There are nuances; large slices cannot be output to the interface since simultaneous scanning of large tables will take a lot of CPU time. The solution to this problem was the report generation service, which has its internal queue and sends the already generated CSV files to the interface. On the other hand, we can output small slices to the interface with a limited date range.
-
-ClickHouse was perfect as Big Data Storage for our ML models.
-
-## Advice To Others Who Might Be Considering ClickHouse
-
-The Devil is in the details!
-
-ClickHouse technical tips:
-
-* If you do not need high data accuracy, use HyperLogLog and sampling;
-* Run load tests to determine the number of operations that your cluster can withstand given your data structure before assembling the cluster;
-* Buffer is a great way to insert data, but watch out for memory;
-* Use Native format for insert;
-* Avoid large numbers of small parts for continuous flow insertion. Too many tables generate a lot of merges in the background such as the Too many parts (300) error; 
-* It is necessary to decide on the replication scheme at the beginning. One option is to use ZooKeeper and let tables replicate themselves using ReplicatedMergeTree and other replicating table engines. Because we had many tables and we wanted to choose what parts of the data to replicate to which servers we chose to not use ZooKeeper and have our client spread the writes - each write goes to two servers.
-
-Over the past five years, the Admixer's Core team has been working with a high-load and aggregation of big data. Any work has its subtleties, do not step on your rake. Use ours. 
-
-We offer customers specialized audit, consultation, or create ready-made solutions using ClickHouse to solve high-load tasks. These speciality services are now offered via our new initiative [LoadFighters](https://loadfighters.com).
-
-### About Admixer
-
-Admixer is an independent adtech company that develops an ecosystem of full-stack programmatic solutions. Admixer has its own line of adtech products for brands, ad agencies, media houses, publishers, ad networks, and other buy- and sell-side industry players looking for effective ad management. Our customizable technology, in-depth expertise, and a personal approach help businesses turn programmatic advertising into a scalable revenue channel.
-
-Since their start in 2008, we’ve been on a mission to build an ecosystem with effective and transparent relationships between all of the players in the digital advertising industry.
-
-Today, the company has over 100 supply and demand partners, 3,000+ customers, and 200+ employees worldwide. They run offices in Ukraine, Belarus, Kazakhstan, Moldova, Georgia, and legal entities in the UK and Germany.
-
-For more information please visit:
-[https://admixer.com/](https://admixer.com/)
diff --git a/website/blog/en/2022/clickhouse-v22.1-released.md b/website/blog/en/2022/clickhouse-v22.1-released.md
deleted file mode 100644
index 045d5367327..00000000000
--- a/website/blog/en/2022/clickhouse-v22.1-released.md
+++ /dev/null
@@ -1,248 +0,0 @@
----
-title: 'What''s New in ClickHouse 22.1'
-image: 'https://blog-images.clickhouse.com/en/2022/clickhouse-v22-1/featured.jpg'
-date: '2022-01-26'
-author: 'Alexey Milovidov'
-tags: ['company', 'community']
----
-
-22.1 is our first release in the new year. It includes 2,599 new commits from 133 contributors, including 44 new contributors:
-
-> 13DaGGeR, Adri Fernandez, Alexey Gusev, Anselmo D. Adams, Antonio Andelic, Ben, Boris Kuschel, Christoph Wurm, Chun-Sheng, Li, Dao, DimaAmega, Dmitrii Mokhnatkin, Harry-Lee, Justin Hilliard, MaxTheHuman, Meena-Renganathan, Mojtaba Yaghoobzadeh, N. Kolotov, Niek, Orkhan Zeynalli, Rajkumar, Ryad ZENINE, Sergei Trifonov, Suzy Wang, TABLUM.IO, Vitaly Artemyev, Xin Wang, Yatian Xu, Youenn Lebras, dalei2019, fanzhou, gulige, lgbo-ustc, minhthucdao, mreddy017, msirm, olevino, peter279k, save-my-heart, tekeri, usurai, zhoubintao, 李扬.
-
-Don't forget to run `SELECT * FROM system.contributors` on your production server!
-
-Let's describe the most important new features in 22.1.
-
-## Schema Inference
-
-Let's look at the following query as an example:
-
-```
-SELECT * FROM url('https://datasets.clickhouse.com/github_events_v2.native.xz', Native,
-$$
-    file_time DateTime,
-    event_type Enum('CommitCommentEvent' = 1, 'CreateEvent' = 2, 'DeleteEvent' = 3, 'ForkEvent' = 4,
-                    'GollumEvent' = 5, 'IssueCommentEvent' = 6, 'IssuesEvent' = 7, 'MemberEvent' = 8,
-                    'PublicEvent' = 9, 'PullRequestEvent' = 10, 'PullRequestReviewCommentEvent' = 11,
-                    'PushEvent' = 12, 'ReleaseEvent' = 13, 'SponsorshipEvent' = 14, 'WatchEvent' = 15,
-                    'GistEvent' = 16, 'FollowEvent' = 17, 'DownloadEvent' = 18, 'PullRequestReviewEvent' = 19,
-                    'ForkApplyEvent' = 20, 'Event' = 21, 'TeamAddEvent' = 22),
-    actor_login LowCardinality(String),
-    repo_name LowCardinality(String),
-    created_at DateTime,
-    updated_at DateTime,
-    action Enum('none' = 0, 'created' = 1, 'added' = 2, 'edited' = 3, 'deleted' = 4, 'opened' = 5, 'closed' = 6, 'reopened' = 7, 'assigned' = 8, 'unassigned' = 9,
-                'labeled' = 10, 'unlabeled' = 11, 'review_requested' = 12, 'review_request_removed' = 13, 'synchronize' = 14, 'started' = 15, 'published' = 16, 'update' = 17, 'create' = 18, 'fork' = 19, 'merged' = 20),
-    comment_id UInt64,
-    body String,
-    path String,
-    position Int32,
-    line Int32,
-    ref LowCardinality(String),
-    ref_type Enum('none' = 0, 'branch' = 1, 'tag' = 2, 'repository' = 3, 'unknown' = 4),
-    creator_user_login LowCardinality(String),
-    number UInt32,
-    title String,
-    labels Array(LowCardinality(String)),
-    state Enum('none' = 0, 'open' = 1, 'closed' = 2),
-    locked UInt8,
-    assignee LowCardinality(String),
-    assignees Array(LowCardinality(String)),
-    comments UInt32,
-    author_association Enum('NONE' = 0, 'CONTRIBUTOR' = 1, 'OWNER' = 2, 'COLLABORATOR' = 3, 'MEMBER' = 4, 'MANNEQUIN' = 5),
-    closed_at DateTime,
-    merged_at DateTime,
-    merge_commit_sha String,
-    requested_reviewers Array(LowCardinality(String)),
-    requested_teams Array(LowCardinality(String)),
-    head_ref LowCardinality(String),
-    head_sha String,
-    base_ref LowCardinality(String),
-    base_sha String,
-    merged UInt8,
-    mergeable UInt8,
-    rebaseable UInt8,
-    mergeable_state Enum('unknown' = 0, 'dirty' = 1, 'clean' = 2, 'unstable' = 3, 'draft' = 4),
-    merged_by LowCardinality(String),
-    review_comments UInt32,
-    maintainer_can_modify UInt8,
-    commits UInt32,
-    additions UInt32,
-    deletions UInt32,
-    changed_files UInt32,
-    diff_hunk String,
-    original_position UInt32,
-    commit_id String,
-    original_commit_id String,
-    push_size UInt32,
-    push_distinct_size UInt32,
-    member_login LowCardinality(String),
-    release_tag_name String,
-    release_name String,
-    review_state Enum('none' = 0, 'approved' = 1, 'changes_requested' = 2, 'commented' = 3, 'dismissed' = 4, 'pending' = 5)
-$$)
-```
-
-In this query we are importing data with the `url` table function. Data is posted on an HTTP server in a `.native.xz` file. The most annoying part of this query is that we have to specify the data structure and the format of this file.
-
-In the new ClickHouse release 22.1 it becomes much easier:
-
-```
-SELECT * FROM url('https://datasets.clickhouse.com/github_events_v2.native.xz')
-```
-
-Cannot be more easy! How is that possible?
-
-Firstly, we detect the data format automatically from the file extension. Here it is `.native.xz`, so we know that the data is compressed by `xz` (LZMA2) compression and is represented in `Native` format. The `Native` format already contains all information about the types and names of the columns, and we just read and use it.
-
-It works for every format that contains information about the data types: `Native`, `Avro`, `Parquet`, `ORC`, `Arrow` as well as `CSVWithNamesAndTypes`, `TSVWithNamesAndTypes`.
-
-And it works for every table function that reads files: `s3`, `file`, `hdfs`, `url`, `s3Cluster`, `hdfsCluster`.
-
-A lot of magic happens under the hood. It does not require reading the whole file in memory. For example, Parquet format has metadata at the end of file. So, we read the header first to find where the metadata is located, then do a range request to read the metadata about columns and their types, then continue to read the requested columns. And if the file is small, it will be read with a single request.
-
-If you want to extract the structure from the file without data processing, the DESCRIBE query is available:
-
-```
-DESCRIBE url('https://datasets.clickhouse.com/github_events_v2.native.xz')
-```
-
-Data structure can be also automatically inferred from `JSONEachRow`, `CSV`, `TSV`, `CSVWithNames`, `TSVWithNames`, `MsgPack`, `Values` and `Regexp` formats.
-
-For `CSV`, either Float64 or String is inferred. For `JSONEachRow` the inference of array types is supported, including multidimensional arrays. Arrays of non-uniform types are mapped to Tuples. And objects are mapped to the `Map` data type.
-
-If a format does not have column names (like `CSV` without a header), the names `c1`, `c2`, ... are used.
-
-File format is detected from the file extension: `csv`, `tsv`, `native`, `parquet`, `pb`, `ndjson`, `orc`... For example, `.ndjson` file is recognized as `JSONEachRow` format and `.csv` is recognized as header-less `CSV` format in ClickHouse, and if you want `CSVWithNames` you can specify the format explicitly.
-
-We support "schema on demand" queries. For example, the autodetected data types for `TSV` format are Strings, but you can refine the types in your query with the `::` operator:
-
-```
-SELECT c1 AS domain, uniq(c2::UInt64), count() AS cnt
-  FROM file('hits.tsv')
-  GROUP BY domain ORDER BY cnt DESC LIMIT 10
-```
-
-As a bonus, `LineAsString` and `RawBLOB` formats also get type inference. Try this query to see how I prefer to read my favorite website:
-
-```
-SELECT extractTextFromHTML(*)
-    FROM url('https://news.ycombinator.com/', LineAsString);
-```
-
-Schema autodetection also works while creating `Merge`, `Distributed` and `ReplicatedMegreTree` tables. When you create the first replica, you have to specify the table structure. But when creating all the subsequent replicas, you only need `CREATE TABLE hits
-ENGINE = ReplicatedMegreTree(...)` without listing the columns - the definition will be copied from another replica.
-
-This feature is implemented by **Pavel Kruglov** with the inspiration of initial work by **Igor Baliuk** and with additions by **ZhongYuanKai**.
-
-## Realtime Resource Usage In clickhouse-client
-
-`clickhouse-client` is my favorite user interface for ClickHouse. It is an example of how friendly every command line application should be.
-
-Now it shows realtime CPU and memory usage for the query directly in the progress bar:
-
-![resource usage](https://blog-images.clickhouse.com/en/2022/clickhouse-v22-1/progress.png)
-
-For distributed queries, we show both total memory usage and max memory usage per host.
-
-This feature was made possible by implementation of distributed metrics forwarding by **Dmitry Novik**. I have added this small visualization to clickhouse-client, and now it is possible to add similar info in every client using native ClickHouse protocol. 
-
-## Parallel Query Processing On Replicas
-
-ClickHouse is a distributed MPP DBMS. It can scale up to use all CPU cores on one server and scale out to use computation resources of multiple shards in a cluster.
-
-But each shard usually contains more than one replica. And by default ClickHouse is using the resources of only one replica on every shard. E.g. if you have a cluster of 6 servers with 3 shards and two replicas on each, a query will use just three servers instead of all six.
-
-There was an option to enable `max_parallel_replicas`, but that option required specifying a "sampling key", it was inconvenient to use and did not scale well.
-
-Now we have a setting to enable the new parallel processing algorithm: `allow_experimental_parallel_reading_from_replicas`. If it is enabled, replicas will *dynamically* select and distribute the work across them.
-
-It works perfectly even if replicas have lower or higher amounts of computation resources. And it gives a complete result even if some replicas are stale.
-
-This feature was implemented by **Nikita Mikhaylov**
-
-## Service Discovery
-
-When adding or removing nodes in a cluster, now you don't have to edit the config on every server. Just use automatic cluster and servers will register itself: 
-
-```
-<allow_experimental_cluster_discovery>1
-</allow_experimental_cluster_discovery>
-
-<remote_servers>
-    <auto_cluster>
-        <discovery>
-            <path>/clickhouse/discovery/auto_cluster</path>
-            <shard>1</shard>
-        </discovery>
-    </auto_cluster>
-</remote_servers>
-```
-
-There is no need to edit the config when adding new replicas!
-
-This feature was implemented by **Vladimir Cherkasov**.
-
-## Sparse Encoding For Columns
-
-If a column contains mostly zeros, we can encode it in sparse format
-and automatically optimize calculations!
-
-It is a special column encoding, similar to `LowCardinality`, but it's completely transparent and works automatically.
-
-```
-CREATE TABLE test.hits ...
-ENGINE = MergeTree ORDER BY ...
-SETTINGS ratio_of_defaults_for_sparse_serialization = 0.9
-```
-
-It allows compressing data better and optimizes computations, because data in sparse columns will be processed directly in sparse format in memory.
-
-Sparse or full format is selected based on column statistics that is calculated on insert and updated on background merges.
-
-Developed by **Anton Popov**.
-
-We also want to make LowCardinality encoding automatic, stay tuned!
-
-## Diagnostic Tool For ClickHouse
-
-It is a gift from the Yandex Cloud team. They have a tool to collect a report about ClickHouse instances to provide all the needed information for support. They decided to contribute this tool to open-source!
-
-You can find the tool here: [utils/clickhouse-diagnostics](https://github.com/ClickHouse/ClickHouse/tree/master/
-utils/clickhouse-diagnostics)
-
-Developed by **Alexander Burmak**. 
-
-## Integrations
-
-Plenty of new integrations were added in 22.1:
-
-Integration with **Hive** as a foreign table engine for SELECT queries, contributed by **Taiyang Li** and reviewed by **Ksenia Sumarokova**.
-
-Integration with **Azure Blob Storage** similar to S3, contributed by **Jakub Kuklis** and reviewed by **Ksenia Sumarokova**.
-
-Support for **hdfsCluster** table function similar to **s3Cluster**, contributed by **Zhichang Yu** and reviewed by **Nikita Mikhailov**.
-
-## Statistical Functions
-
-I hope you have always dreamed of calculating the Cramer's V and Theil's U coefficients in ClickHouse, because now we have these functions for you and you have to deal with it.
-
-```
-:) SELECT cramersV(URL, URLDomain) FROM test.hits
-
-0.98
-
-:) SELECT cramersV(URLDomain, ResolutionWidth) FROM test.hits
-
-0.27
-```
-
-It can calculate some sort of dependency between categorical (discrete) values. You can imagine it like this: there is a correlation function `corr` but it is only applicable for linear dependencies; there is a rank correlation function `rankCorr` but it is only applicable for ordered values. And now there are a few functions to calculate *something* for discrete values.
-
-Developers: **Artem Tsyganov**, **Ivan Belyaev**, **Alexey Milovidov**.
-
-
-## ... And Many More
-
-Read the [full changelog](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md) for the 22.1 release and follow [the roadmap](https://github.com/ClickHouse/ClickHouse/issues/32513).
diff --git a/website/blog/en/2022/clickhouse-v22.2-released.md b/website/blog/en/2022/clickhouse-v22.2-released.md
deleted file mode 100644
index d55b0e6bcf0..00000000000
--- a/website/blog/en/2022/clickhouse-v22.2-released.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-title: 'ClickHouse 22.2 Released'
-image: 'https://blog-images.clickhouse.com/en/2022/clickhouse-v22-2/featured.jpg'
-date: '2022-02-23'
-author: 'Alexey Milovidov'
-tags: ['company', 'community']
----
-
-We prepared a new ClickHouse release 22.2, so it's nice if you have tried it on 2022-02-22. If not, you can try it today. This latest release includes 2,140 new commits from 118 contributors, including 41 new contributors:
-
-> Aaron Katz, Andre Marianiello, Andrew, Andrii Buriachevskyi, Brian Hunter, CoolT2, Federico Rodriguez, Filippov Denis, Gaurav Kumar, Geoff Genz, HarryLeeIBM, Heena Bansal, ILya Limarenko, Igor Nikonov, IlyaTsoi, Jake Liu, JaySon-Huang, Lemore, Leonid Krylov, Michail Safronov, Mikhail Fursov, Nikita, RogerYK, Roy Bellingan, Saad Ur Rahman, W, Yakov Olkhovskiy, alexeypavlenko, cnmade, grantovsky, hanqf-git, liuneng1994, mlkui, s-kat, tesw yew isal, vahid-sohrabloo, yakov-olkhovskiy, zhifeng, zkun, zxealous, 박동철.
-
-Let me tell you what is most interesting in 22.2...
-
-## Projections are production ready
-
-Projections allow you to have multiple data representations in the same table. For example, you can have data aggregations along with the raw data. There are no restrictions on which aggregate functions can be used - you can have count distinct, quantiles, or whatever you want. You can have data in multiple different sorting orders. ClickHouse will automatically select the most suitable projection for your query, so the query will be automatically optimized.
-
-Projections are somewhat similar to Materialized Views, which also allow you to have incremental aggregation and multiple sorting orders. But unlike Materialized Views, projections are updated atomically and consistently with the main table. The data for projections is being stored in the same "data parts" of the table and is being merged in the same way as the main data.
-
-The feature was developed by **Amos Bird**, a prominent ClickHouse contributor. The [prototype](https://github.com/ClickHouse/ClickHouse/pull/20202) has been available since Feb 2021, it has been merged in the main codebase by **Nikolai Kochetov** in May 2021 under experimental flag, and after 21 follow-up pull requests we ensured that it passed the full set of test suites and enabled it by default.
-
-Read an example of how to optimize queries with projections [in our docs](https://clickhouse.com/docs/en/getting-started/example-datasets/uk-price-paid/#speedup-with-projections).
-
-## Control of file creation and rewriting on data export
-
-When you export your data with an `INSERT INTO TABLE FUNCTION` statement into `file`, `s3` or `hdfs` and the target file already exists, you can now control how to deal with it: you can append new data into the file if it is possible, rewrite it with new data, or create another file with a similar name like 'data.1.parquet.gz'. 
-
-Some storage systems like `s3` and some formats like `Parquet` don't support data appending. In previous ClickHouse versions, if you insert multiple times into a file with Parquet data format, you will end up with a file that is not recognized by other systems. Now you can choose between throwing exceptions on subsequent inserts or creating more files.
-
-So, new settings were introduced: `s3_truncate_on_insert`, `s3_create_new_file_on_insert`, `hdfs_truncate_on_insert`, `hdfs_create_new_file_on_insert`, `engine_file_allow_create_multiple_files`.
-
-This feature [was developed](https://github.com/ClickHouse/ClickHouse/pull/33302) by **Pavel Kruglov**.
-
-## Custom deduplication token
-
-`ReplicatedMergeTree` and `MergeTree` types of tables implement block-level deduplication. When a block of data is inserted, its cryptographic hash is calculated and if the same block was already inserted before, then the duplicate is skipped and the insert query succeeds. This makes it possible to implement exactly-once semantics for inserts.
-
-In ClickHouse version 22.2 you can provide your own deduplication token instead of an automatically calculated hash. This makes sense if you already have batch identifiers from some other system and you want to reuse them. It also makes sense when blocks can be identical but they should actually be inserted multiple times. Or the opposite - when blocks contain some random data and you want to deduplicate only by significant columns.
-
-This is implemented by adding the setting `insert_deduplication_token`. The feature was contributed by **Igor Nikonov**. 
-
-## DEFAULT keyword for INSERT
-
-A small addition for SQL compatibility - now we allow using the `DEFAULT` keyword instead of a value in `INSERT INTO ... VALUES` statement. It looks like this: 
-
-`INSERT INTO test VALUES (1, 'Hello', DEFAULT)`
-
-Thanks to **Andrii Buriachevskyi** for this feature. 
-
-## EPHEMERAL columns
-
-A column in a table can have a `DEFAULT` expression like `c INT DEFAULT a + b`. In ClickHouse you can also use `MATERIALIZED` instead of `DEFAULT` if you want the column to be always calculated with the provided expression instead of allowing a user to insert data. And you can use `ALIAS` if you don't want the column to be stored at all but instead to be calculated on the fly if referenced.
-
-Since version 22.2 a new type of column is added: `EPHEMERAL` column. The user can insert data into this column but the column is not stored in a table, it's ephemeral. The purpose of this column is to provide data to calculate other columns that can reference it with `DEFAULT` or `MATERIALIZED` expressions.
-
-This feature was made by **Yakov Olkhovskiy**.
-
-## Improvements for multi-disk configuration
-
-You can configure multiple disks to store ClickHouse data instead of managing RAID and ClickHouse will automatically manage the data placement.
-
-Since version 22.2 ClickHouse can automatically repair broken disks without server restart by downloading the missing parts from replicas and placing them on the healthy disks.
-
-This feature was implemented by **Amos Bird** and is already being used for more than 1.5 years in production at Kuaishou.
-
-Another improvement is the option to specify TTL MOVE TO DISK/VOLUME **IF EXISTS**. It allows replicas with non-uniform disk configuration and to have one replica to move old data to cold storage while another replica has all the data on hot storage. Data will be moved only on replicas that have the specified disk or volume, hence *if exists*. This was developed by **Anton Popov**.
-
-## Flexible memory limits
-
-We split per-query and per-user memory limits into a pair of hard and soft limits. The settings `max_memory_usage` and `max_memory_usage_for_user` act as hard limits. When memory consumption is approaching the hard limit, an exception will be thrown. Two other settings: `max_guaranteed_memory_usage` and `max_guaranteed_memory_usage_for_user` act as soft limits.
-
-A query will be allowed to use more memory than a soft limit if there is available memory. But if there will be memory shortage (relative to the per-user hard limit or total per-server memory consumption), we calculate the "overcommit ratio" - how much more memory every query is consuming relative to the soft limit - and we will kill the most overcommitted query to let other queries run.
- 
-In short, your query will not be limited to a few gigabytes of RAM if you have hundreds of gigabytes available.
-
-This experimental feature was implemented by **Dmitry Novik** and is continuing to be developed.
-
-## Shell-style comments in SQL
-
-Now we allow comments starting with `# ` or `#!`, similar to MySQL. The variant with `#!` allows using shell scripts with "shebang" interpreted by `clickhouse-local`.
-
-This feature was contributed by **Aaron Katz**. Very nice.  
-
-
-## And many more...
-
-Maxim Kita, Danila Kutenin, Anton Popov, zhanglistar, Federico Rodriguez, Raúl Marín, Amos Bird and Alexey Milovidov have contributed a ton of performance optimizations for this release. We are obsessed with high performance, as usual. :)
-
-Read the [full changelog](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md) for the 22.2 release and follow [the roadmap](https://github.com/ClickHouse/ClickHouse/issues/32513).
diff --git a/website/blog/en/2022/opensee-analyzing-terabytes-of-financial-data-a-day-with-clickhouse.md b/website/blog/en/2022/opensee-analyzing-terabytes-of-financial-data-a-day-with-clickhouse.md
deleted file mode 100644
index 25d9fd3e965..00000000000
--- a/website/blog/en/2022/opensee-analyzing-terabytes-of-financial-data-a-day-with-clickhouse.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-title: 'Opensee: Analyzing Terabytes of Financial Data a Day With ClickHouse'
-image: 'https://blog-images.clickhouse.com/en/2022/opensee/featured.png'
-date: '2022-02-22'
-author: 'Christophe Rivoire, Elena Bessis'
-tags: ['company', 'community']
----
-
-We’d like to welcome Christophe Rivoire (UK Country Manager) and Elena Bessis (Product Marketing Assistant) from Opensee as guests to our blog. Today, they’re telling us how their product, powered by ClickHouse, allows financial institutions’ business users to directly harness 100% of their vast quantities of data instantly and on demand, with no size limitations. 
-
-Opensee is a financial technology company providing real time self-service analytics solutions to financial institutions, which help them turn their big data challenges into a competitive advantage — unlocking vital opportunities led by business users. Opensee, formerly ICA, was started by a team of financial industry and technology experts frustrated that no simple big data analytics solution enabled them to dive deeper into all their data easily and efficiently, or perform what-if analysis on the hundreds of terabytes of data they were handling. 
-
-So they built their own. 
-
-
-## ClickHouse For Trillions Of Financial Data Points
-
-Financial institutions have always been storing a lot of data (customer data, risk data, transaction data...) for their own decision processes and for regulatory reasons. Since the financial crisis, regulators all around the world have been significantly increasing the reporting requirements, insisting on longer historical ranges and deeper granularity. This combination has generated an exponential amount of data, which has forced financial institutions to review and upgrade their infrastructure. Opensee offers a solution to navigate all these very large data cubes, based on millions, billions or even trillions of data points. In order to build it, a data storage system capable of scaling horizontally with data and with fast OLAP query response time was required. In 2016, after thorough evaluation, Opensee concluded ClickHouse was the obvious solution. 
-
-There are many use cases that involve storing and leveraging massive amounts of data on a daily basis, but Opensee built from the strength of their own expertise, evaluating risk linked to activities in the financial market. There are various types of risks (market risk, credit risk, liquidity risk…) and all of them need to aggregate a lot of data in order to calculate linear or non-linear indicators, both business and regulatory, and analyze all those numbers on the fly.
-
-!["Dashboard in Opensee for a Market Risk use case"](https://blog-images.clickhouse.com/en/2022/opensee/dashboard.png)
-_Dashboard in Opensee for a Market Risk use case_
-
-
-## ClickHouse for Scalability, Granularity, Speed and Cost Control
-
-Financial institutions have sometimes believed that their ability to craft efficient storage solutions like data lakes for their vast amounts of data, typically built on a Hadoop stack, would make real-time analytics available. Unfortunately, many of these systems are too slow for at-scale analytics. 
-
-Running a query on a Hadoop data lake is just not an option for users with real-time needs! Banks experimented with different types of analytical layers between the data lakes and the users, in order to allow access to their stored data and to run analytics, but ran into new challenges: in-memory computing solutions have a lack of scalability and high hardware costs. Others tried query accelerators but were forced to analyze only prepared data (pre-aggregated or specifically indexed data), losing the granularity which is always required to understand things like daily changes. More recently, financial institutions have been contemplating cloud database management systems, but for very large datasets and calculations the speed of these services is far from what ClickHouse can achieve for their specific use cases. 
-
-Ultimately, none of these technologies could simultaneously combine scalability, granularity, speed and cost control, forcing financial institutions into a series of compromises. With Opensee, there is no need to compromise: the platform leverages ClickHouse's capacity to handle the huge volume that data lakes require and the fast response that in-memory databases can give, without the need to pre-aggregate the data. 
-
-
-
-!["Dashboard in Opensee for a Market Risk use case"](https://blog-images.clickhouse.com/en/2022/opensee/pivot-table.png)
-_Pivot table from the Opensee UI on a liquidity use case_
-
-
-## Opensee Architecture 
-
-Opensee provides a series of APIs which allows users to fully abstract all the complexity and in particular the physical data model. These APIs are typically used for data ingestion, data query, model management, etc. Thanks to Opensee’s low-code API, users don’t need to access data through complex quasi-SQL queries, but rather through simple business queries that are optimized by Opensee to deliver performance. Opensee’s back end, which provides indirect access to Clickhouse, is written in Scala, while PostgreSQL contains all the configuration and context data that must be managed transactionally. Opensee also provides various options for front ends (dedicated Opensee web or rich user interface, Excel, others…) to interact with the data, navigate through the cube and leverage functionality like data versioning — built for the financial institution’s use. 
-
-
-
-!["Dashboard in Opensee for a Market Risk use case"](https://blog-images.clickhouse.com/en/2022/opensee/architecture-chart.png)
-_Opensee architecture chart_
-
-
-## Advantages of ClickHouse
-
-For Opensee, the most valuable feature is horizontal scalability, the capability to shard the data. Next comes the very fast dictionary lookup, rapid calculations with vectorization and the capability to manage array values. In the financial industry, where time series or historical data is everywhere, this capacity to calculate vectors and manage array values is critical.	
-
-On top of being a solution that is extremely fast and efficient, other advantages include:
-
-
-- distributed and replicated, with high availability and a performant map/reduce system
-- wide range of features fit for analytics
-- really good and extensive format support (csv, json, parquet, orc, protobuf ....)
-- very rapid evolutions through the high contributions of a wide community to a very popular Open Source technology
-
-On top of these native ClickHouse strengths and functionalities, Opensee has developed a lot of other functionalities dedicated to financial institutions. To name only a few, a data versioning mechanism has been created allowing business users to either correct on the fly inaccurate data or simulate new values. This ‘What If’ simulation feature can be used to add, amend or delete transactions,with full auditability and traceability, without deleting any data.
-
-Another key feature is a Python processor which is available to define  more complex calculations. Furthermore, the abstraction model layer has been built to remove the complexity of the physical data model for the users and optimize the queries. And, last but not least, in terms of visualization, a UI dedicated to financial institutions has been developed with and for its users.		
-
-
-## Dividing Hardware Costs By 10+
-
-The cost efficiency factor is a key improvement for large financial institutions typically using in-memory computing technology. Dividing by ten (and sometimes more) the hardware cost is no small achievement! Being able to use very large datasets on standard servers on premise or in the cloud is a big achievement. With Opensee powered by ClickHouse, financial institutions are able to alleviate critical limitations of their existing solutions, avoiding legacy compromises and a lack of flexibility. Finally, these organizations are able to provide their users a turn-key solution to analyze all their data sets, which used to be siloed, in one single place, one single data model, one single infrastructure, and all of that in real time, combining very granular and very long historical ranges.
-
-## About Opensee
-
-Opensee empowers financial data divers to analyze deeper and faster. Headquartered in Paris, with offices in London and New York, Opensee is working with a trusted client base across global Tier 1 banks, asset managers, hedge funds and trading platforms.
-
-For more information please visit [www.opensee.io](http://www.opensee.io) or follow them on [LinkedIn](https://www.linkedin.com/company/opensee-company) and [Twitter](https://twitter.com/opensee_io).
diff --git a/website/blog/en/index.md b/website/blog/en/index.md
deleted file mode 100644
index 227a69408dc..00000000000
--- a/website/blog/en/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-is_index: true
----
diff --git a/website/blog/en/redirects.txt b/website/blog/en/redirects.txt
deleted file mode 100644
index 2e4cd6e2dd4..00000000000
--- a/website/blog/en/redirects.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-clickhouse-meetup-in-berlin-october-5-2017.md 2017/clickhouse-meetup-in-berlin-october-5-2017.md
-clickhouse-meetup-at-berlin-october-5-2017.md 2017/clickhouse-meetup-in-berlin-october-5-2017.md
-clickhouse-meetup-in-santa-clara-may-4-2017.md 2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
-clickhouse-meetup-at-santa-clara-may-4-2017.md 2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
-clickhouse-community-meetup-in-berlin-on-july-3.md 2018/announcing-clickhouse-community-meetup-in-berlin-on-july-3.md
-evolution-of-data-structures-in-yandex-metrica.md 2016/evolution-of-data-structures-in-yandex-metrica.md
-how-to-update-data-in-clickhouse.md 2016/how-to-update-data-in-clickhouse.md
-yandex-opensources-clickhouse.md 2016/yandex-opensources-clickhouse.md
-clickhouse-at-data-scale-2017.md 2017/clickhouse-at-data-scale-2017.md
-clickhouse-meetup-in-berlin-october-5-2017.md 2017/clickhouse-meetup-in-berlin-october-5-2017.md
-join-the-clickhouse-meetup-in-berlin.md 2017/join-the-clickhouse-meetup-in-berlin.md
-clickhouse-at-percona-live-2017.md 2017/clickhouse-at-percona-live-2017.md
-clickhouse-meetup-in-santa-clara-may-4-2017.md 2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
-announcing-clickhouse-meetup-in-amsterdam-on-november-15.md 2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md
-clickhouse-community-meetup-in-berlin-on-july-3-2018.md 2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md
-clickhouse-at-analysys-a10-2018.md 2018/clickhouse-at-analysys-a10-2018.md
-clickhouse-community-meetup-in-berlin-on-july-3.md 2018/clickhouse-community-meetup-in-berlin-on-july-3.md
-clickhouse-community-meetup-in-paris-on-october-2-2018.md 2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md
-clickhouse-community-meetup-in-beijing-on-october-28-2018.md 2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md
-clickhouse-meetup-in-amsterdam-on-november-15-2018.md 2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md
-clickhouse-community-meetup-in-beijing-on-january-27-2018.md 2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md
-clickhouse-at-percona-live-europe-2018.md 2018/clickhouse-at-percona-live-europe-2018.md
-concept-cloud-mergetree-tables.md 2018/concept-cloud-mergetree-tables.md
-clickhouse-meetup-in-limassol-on-may-7-2019.md 2019/clickhouse-meetup-in-limassol-on-may-7-2019.md
-schedule-of-clickhouse-meetups-in-china-for-2019.md 2019/schedule-of-clickhouse-meetups-in-china-for-2019.md
-clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md 2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md
-clickhouse-meetup-in-san-francisco-on-june-4-2019.md 2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md
-how-to-speed-up-lz4-decompression-in-clickhouse.md 2019/how-to-speed-up-lz4-decompression-in-clickhouse.md
-clickhouse-at-percona-live-2019.md 2019/clickhouse-at-percona-live-2019.md
-clickhouse-meetup-in-madrid-on-april-2-2019.md 2019/clickhouse-meetup-in-madrid-on-april-2-2019.md
-clickhouse-meetup-in-beijing-on-june-8-2019.md 2019/clickhouse-meetup-in-beijing-on-june-8-2019.md
-five-methods-for-database-obfuscation.md 2020/five-methods-for-database-obfuscation.md
-2022/admixer-aggregates-over-1-billion-unique-users-a-day-using-clickhouse.md 2022/a-mixer-aggregates-over-1-billion-unique-users-a-day-using-clickhouse.md
diff --git a/website/careers/index.html b/website/careers/index.html
deleted file mode 100644
index 3505da3df94..00000000000
--- a/website/careers/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block banner %}
-
-{% include "templates/global/banner.html" %}
-
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/careers/hero.html" %}
-{% include "templates/careers/overview.html" %}
-{% include "templates/careers/greenhouse.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}
diff --git a/website/company/index.html b/website/company/index.html
deleted file mode 100644
index 62bb0bdad23..00000000000
--- a/website/company/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block banner %}
-
-{% include "templates/global/banner.html" %}
-
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/company/hero.html" %}
-{% include "templates/company/overview.html" %}
-{% include "templates/company/founders.html" %}
-{% include "templates/company/team.html" %}
-{% include "templates/company/press.html" %}
-{% include "templates/company/contact.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}
diff --git a/website/legal/trademark-policy/index.html b/website/legal/trademark-policy/index.html
deleted file mode 100644
index 73da51b140a..00000000000
--- a/website/legal/trademark-policy/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block banner %}
-
-{% include "templates/global/banner.html" %}
-
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/trademark-policy/hero.html" %}
-{% include "templates/trademark-policy/content.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}
diff --git a/website/locale/en/LC_MESSAGES/messages.mo b/website/locale/en/LC_MESSAGES/messages.mo
deleted file mode 100644
index 370e2c73150..00000000000
Binary files a/website/locale/en/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/en/LC_MESSAGES/messages.po b/website/locale/en/LC_MESSAGES/messages.po
deleted file mode 100644
index bc8c78f051c..00000000000
--- a/website/locale/en/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# English translations for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language: en\n"
-"Language-Team: en <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management "
-"system that allows generating analytical data reports in real-time using "
-"SQL queries"
-msgstr ""
-"ClickHouse is a fast open-source column-oriented database management "
-"system that allows generating analytical data reports in real-time using "
-"SQL queries"
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr "ClickHouse - fast open-source OLAP DBMS"
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr "ClickHouse DBMS"
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr "open-source"
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr "relational"
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr "analytics"
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr "analytical"
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr "Big Data"
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr "web-analytics"
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr "ClickHouse source code is published under the Apache 2.0 License."
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr "Yandex LLC"
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr "Share on"
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr "Published date"
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr "New&nbsp;post"
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr "Documentation"
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr "Rating"
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr "votes"
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr "Article Rating"
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr "Was this content helpful?"
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr "Unusable"
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr "Poor"
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr "Good"
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr "Excellent"
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr "documentation"
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr "Built from"
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr "published on"
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr "modified on"
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr "Help wanted!"
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-"
-"readable."
-msgstr ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-"
-"readable."
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr "You can also use the original English version as a reference."
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr "Help ClickHouse documentation by editing this page"
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr "Multi-page or single-page"
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr "Multi-page version"
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr "Single-page version"
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr "Version"
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr "latest"
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr "PDF version"
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr "Table of Contents"
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr "ClickHouse community"
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr "ClickHouse YouTube Channel"
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr "ClickHouse Official Twitter Account"
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr "ClickHouse at Telegram"
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr "Chat with real users in "
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr "English"
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr "or in"
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr "Russian"
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr "Open GitHub issue to ask for help or to file a feature request"
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr "ClickHouse Slack Workspace"
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr "Multipurpose public hangout"
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr "Ask any questions"
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr "ClickHouse Blog"
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr "in"
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr "ClickHouse at Google Groups"
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr "Email discussions"
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr "Like ClickHouse?"
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr "Help to spread the word about it via"
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr "and"
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr "Hosting ClickHouse Meetups"
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, "
-"but they couldn't be possible without the help of local organizers. "
-"Please, fill this form if you want to become one or want to meet "
-"ClickHouse core team for any other reason."
-msgstr ""
-"ClickHouse meetups are essential for strengthening community worldwide, "
-"but they couldn't be possible without the help of local organizers. "
-"Please, fill this form if you want to become one or want to meet "
-"ClickHouse core team for any other reason."
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr "ClickHouse Meetup"
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr "Name"
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr "Email"
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr "Company"
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr "City"
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr "We'd like to host a public ClickHouse Meetup"
-
-#: templates/index/community.html:185
-msgid "We'd like to invite ClickHouse team to our office"
-msgstr "We'd like to invite ClickHouse team to our office"
-
-#: templates/index/community.html:191
-msgid "We'd like to invite ClickHouse team to another event we organize"
-msgstr "We'd like to invite ClickHouse team to another event we organize"
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr "We're interested in commercial consulting, support or managed service"
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr "Additional comments"
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr "Send"
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr "turn on JavaScript to see email address"
-
-#~ msgid ""
-#~ "ClickHouse is an open source column-"
-#~ "oriented database management system that "
-#~ "allows generating analytical data reports "
-#~ "in real time using SQL queries."
-#~ msgstr ""
-#~ "ClickHouse is an open source column-"
-#~ "oriented database management system that "
-#~ "allows generating analytical data reports "
-#~ "in real time using SQL queries."
-
-#~ msgid ""
-#~ "ClickHouse is an open source distributed"
-#~ " column-oriented database management system"
-#~ " that allows generating analytical data "
-#~ "reports in real time using SQL "
-#~ "queries. Сreated by ClickHouse "
-#~ "manages extremely large volumes of data"
-#~ " in a stable and sustainable manner."
-#~ msgstr ""
-#~ "ClickHouse is an open source distributed"
-#~ " column-oriented database management system"
-#~ " that allows generating analytical data "
-#~ "reports in real time using SQL "
-#~ "queries. Сreated by ClickHouse "
-#~ "manages extremely large volumes of data"
-#~ " in a stable and sustainable manner."
-
-#~ msgid "published at"
-#~ msgstr "published at"
-
-#~ msgid "modified at"
-#~ msgstr "modified at"
-
diff --git a/website/locale/ja/LC_MESSAGES/messages.mo b/website/locale/ja/LC_MESSAGES/messages.mo
deleted file mode 100644
index 2061fefa110..00000000000
Binary files a/website/locale/ja/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/ja/LC_MESSAGES/messages.po b/website/locale/ja/LC_MESSAGES/messages.po
deleted file mode 100644
index c7ad2b5ae85..00000000000
--- a/website/locale/ja/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,326 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/locale/messages.pot b/website/locale/messages.pot
deleted file mode 100644
index cfbdf52553b..00000000000
--- a/website/locale/messages.pot
+++ /dev/null
@@ -1,328 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management "
-"system that allows generating analytical data reports in real-time using "
-"SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-"
-"readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, "
-"but they couldn't be possible without the help of local organizers. "
-"Please, fill this form if you want to become one or want to meet "
-"ClickHouse core team for any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
-
diff --git a/website/locale/ru/LC_MESSAGES/messages.mo b/website/locale/ru/LC_MESSAGES/messages.mo
deleted file mode 100644
index 0ed39012330..00000000000
Binary files a/website/locale/ru/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/ru/LC_MESSAGES/messages.po b/website/locale/ru/LC_MESSAGES/messages.po
deleted file mode 100644
index ec6fbadc33b..00000000000
--- a/website/locale/ru/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,327 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/locale/zh/LC_MESSAGES/messages.mo b/website/locale/zh/LC_MESSAGES/messages.mo
deleted file mode 100644
index c5c8a3ba501..00000000000
Binary files a/website/locale/zh/LC_MESSAGES/messages.mo and /dev/null differ
diff --git a/website/locale/zh/LC_MESSAGES/messages.po b/website/locale/zh/LC_MESSAGES/messages.po
deleted file mode 100644
index 031b66c1a75..00000000000
--- a/website/locale/zh/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,325 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2020 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# Automatically generated, 2020.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-06-17 12:20+0300\n"
-"PO-Revision-Date: 2020-06-17 12:20+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
-"Language: zh\n"
-
-#: templates/common_meta.html:1
-msgid ""
-"ClickHouse is a fast open-source column-oriented database management system "
-"that allows generating analytical data reports in real-time using SQL queries"
-msgstr ""
-
-#: templates/common_meta.html:6
-msgid "ClickHouse - fast open-source OLAP DBMS"
-msgstr ""
-
-#: templates/common_meta.html:10
-msgid "ClickHouse DBMS"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "open-source"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "relational"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytics"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "analytical"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "Big Data"
-msgstr ""
-
-#: templates/common_meta.html:32
-msgid "web-analytics"
-msgstr ""
-
-#: templates/footer.html:8
-msgid "ClickHouse source code is published under the Apache 2.0 License."
-msgstr ""
-
-#: templates/footer.html:8
-msgid ""
-"Software is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "
-"CONDITIONS OF ANY KIND, either express or implied."
-msgstr ""
-
-#: templates/footer.html:11
-msgid "Yandex LLC"
-msgstr ""
-
-#: templates/blog/content.html:20 templates/blog/content.html:25
-#: templates/blog/content.html:30
-msgid "Share on"
-msgstr ""
-
-#: templates/blog/content.html:37
-msgid "Published date"
-msgstr ""
-
-#: templates/blog/nav.html:20
-msgid "New&nbsp;post"
-msgstr ""
-
-#: templates/blog/nav.html:25
-msgid "Documentation"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "Rating"
-msgstr ""
-
-#: templates/docs/footer.html:3
-msgid "votes"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Article Rating"
-msgstr ""
-
-#: templates/docs/footer.html:4
-msgid "Was this content helpful?"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Unusable"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Poor"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Good"
-msgstr ""
-
-#: templates/docs/footer.html:7
-msgid "Excellent"
-msgstr ""
-
-#: templates/docs/footer.html:8
-msgid "documentation"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "Built from"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "published on"
-msgstr ""
-
-#: templates/docs/footer.html:15
-msgid "modified on"
-msgstr ""
-
-#: templates/docs/machine-translated.html:3
-msgid "Help wanted!"
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid ""
-"The following content of this documentation page has been machine-"
-"translated. But unlike other websites, it is not done on the fly. This "
-"translated text lives on GitHub repository alongside main ClickHouse "
-"codebase and waits for fellow native speakers to make it more human-readable."
-msgstr ""
-
-#: templates/docs/machine-translated.html:4
-msgid "You can also use the original English version as a reference."
-msgstr ""
-
-#: templates/docs/machine-translated.html:7
-msgid "Help ClickHouse documentation by editing this page"
-msgstr ""
-
-#: templates/docs/sidebar.html:3
-msgid "Multi-page or single-page"
-msgstr ""
-
-#: templates/docs/sidebar.html:5
-msgid "Multi-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:8
-msgid "Single-page version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13
-msgid "Version"
-msgstr ""
-
-#: templates/docs/sidebar.html:13 templates/docs/sidebar.html:19
-msgid "latest"
-msgstr ""
-
-#: templates/docs/sidebar.html:36
-msgid "PDF version"
-msgstr ""
-
-#: templates/docs/toc.html:8
-msgid "Table of Contents"
-msgstr ""
-
-#: templates/index/community.html:4
-msgid "ClickHouse community"
-msgstr ""
-
-#: templates/index/community.html:13 templates/index/community.html:14
-msgid "ClickHouse YouTube Channel"
-msgstr ""
-
-#: templates/index/community.html:25 templates/index/community.html:26
-msgid "ClickHouse Official Twitter Account"
-msgstr ""
-
-#: templates/index/community.html:36 templates/index/community.html:37
-msgid "ClickHouse at Telegram"
-msgstr ""
-
-#: templates/index/community.html:41
-msgid "Chat with real users in "
-msgstr ""
-
-#: templates/index/community.html:44 templates/index/community.html:116
-msgid "English"
-msgstr ""
-
-#: templates/index/community.html:45
-msgid "or in"
-msgstr ""
-
-#: templates/index/community.html:47 templates/index/community.html:117
-msgid "Russian"
-msgstr ""
-
-#: templates/index/community.html:65
-msgid "Open GitHub issue to ask for help or to file a feature request"
-msgstr ""
-
-#: templates/index/community.html:76 templates/index/community.html:77
-msgid "ClickHouse Slack Workspace"
-msgstr ""
-
-#: templates/index/community.html:82
-msgid "Multipurpose public hangout"
-msgstr ""
-
-#: templates/index/community.html:101
-msgid "Ask any questions"
-msgstr ""
-
-#: templates/index/community.html:115
-msgid "ClickHouse Blog"
-msgstr ""
-
-#: templates/index/community.html:116
-msgid "in"
-msgstr ""
-
-#: templates/index/community.html:128 templates/index/community.html:129
-msgid "ClickHouse at Google Groups"
-msgstr ""
-
-#: templates/index/community.html:133
-msgid "Email discussions"
-msgstr ""
-
-#: templates/index/community.html:142
-msgid "Like ClickHouse?"
-msgstr ""
-
-#: templates/index/community.html:143
-msgid "Help to spread the word about it via"
-msgstr ""
-
-#: templates/index/community.html:144
-msgid "and"
-msgstr ""
-
-#: templates/index/community.html:153
-msgid "Hosting ClickHouse Meetups"
-msgstr ""
-
-#: templates/index/community.html:157
-msgid ""
-"ClickHouse meetups are essential for strengthening community worldwide, but "
-"they couldn't be possible without the help of local organizers. Please, fill "
-"this form if you want to become one or want to meet ClickHouse core team for "
-"any other reason."
-msgstr ""
-
-#: templates/index/community.html:159
-msgid "ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:165
-msgid "Name"
-msgstr ""
-
-#: templates/index/community.html:168
-msgid "Email"
-msgstr ""
-
-#: templates/index/community.html:171
-msgid "Company"
-msgstr ""
-
-#: templates/index/community.html:174
-msgid "City"
-msgstr ""
-
-#: templates/index/community.html:179
-msgid "We'd like to host a public ClickHouse Meetup"
-msgstr ""
-
-#: templates/index/community.html:185
-msgid "We'd like to invite ClickHouse team to our office"
-msgstr ""
-
-#: templates/index/community.html:191
-msgid "We'd like to invite ClickHouse team to another event we organize"
-msgstr ""
-
-#: templates/index/community.html:197
-msgid "We're interested in commercial consulting, support or managed service"
-msgstr ""
-
-#: templates/index/community.html:201
-msgid "Additional comments"
-msgstr ""
-
-#: templates/index/community.html:203
-msgid "Send"
-msgstr ""
-
-#: templates/index/community.html:212
-msgid ""
-"If you have any more thoughts or questions, feel free to contact Yandex "
-"ClickHouse team directly at"
-msgstr ""
-
-#: templates/index/community.html:213
-msgid "turn on JavaScript to see email address"
-msgstr ""
diff --git a/website/support/agreement/index.html b/website/support/agreement/index.html
deleted file mode 100644
index 59e5ca9ab75..00000000000
--- a/website/support/agreement/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-<meta name="robots" content="noindex">
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/support/agreement-hero.html" %}
-
-{% include "templates/support/agreement-content.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}
diff --git a/website/support/case/index.html b/website/support/case/index.html
deleted file mode 100644
index 07f77d65d46..00000000000
--- a/website/support/case/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-<meta name="robots" content="noindex">
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/support/hero.html" %}
-{% include "templates/support/overview.html" %}
-{% include "templates/support/form.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}
diff --git a/website/support/policy/index.html b/website/support/policy/index.html
deleted file mode 100644
index babff39a747..00000000000
--- a/website/support/policy/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-<meta name="robots" content="noindex">
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/support/policy-hero.html" %}
-
-{% include "templates/support/policy-content.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}
diff --git a/website/thank-you/index.html b/website/thank-you/index.html
deleted file mode 100644
index 2f1a172e277..00000000000
--- a/website/thank-you/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-{% include "templates/common_fonts.html" %}
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/contact-thank-you/hero.html" %}
-{% include "templates/contact-thank-you/overview.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-
-{% endblock %}