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..c890488ea80 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -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..76a26d685c5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -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/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/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/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/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 0a254f8c8ae..21ec7cf635b 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -92,7 +92,7 @@ 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==)
 
 ## Adding new third-party libraries and maintaining patches in third-party libraries {#adding-third-party-libraries}
 
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/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/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/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/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/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 f58776cf843..f6121b238b3 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -1166,12 +1166,12 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
                     ? 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());
             }
         }
@@ -1206,13 +1206,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);
             }
@@ -1222,13 +1216,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);
             }
@@ -1250,7 +1238,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)
         {
@@ -1261,13 +1249,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 ccbddcf6e19..b7fb76a72e6 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -96,7 +96,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..b79dba69e9c 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) \
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/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/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/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index d0d9fba763c..bd664224d41 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -643,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/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/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 6bff83882d7..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); }
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 1c38aebd120..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
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..65b1d5a5bdf
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -0,0 +1,678 @@
+#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;
+}
+
+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);
+}
+
+
+DiskObjectStorage::Metadata DiskObjectStorage::readUpdateStoreMetadataAndRemove(const String & path, bool sync, DiskObjectStorage::MetadataUpdater updater)
+{
+    std::unique_lock lock(metadata_mutex);
+    return 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)
+        {
+            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())
+            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);
+    }
+
+    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());
+            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..d89c00a5567
--- /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);
+    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 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..2e1ef31f8f0
--- /dev/null
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
@@ -0,0 +1,208 @@
+#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 MEMORY_LIMIT_EXCEEDED;
+}
+
+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;
+}
+
+DiskObjectStorageMetadata DiskObjectStorageMetadata::readUpdateStoreMetadataAndRemove(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);
+    metadata_disk_->removeFile(metadata_file_path_);
+
+    return result;
+
+}
+
+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()
+{
+    try
+    {
+        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);
+        }
+    }
+    catch (Exception & e)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+
+        if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
+            throw;
+
+        if (e.code() == ErrorCodes::MEMORY_LIMIT_EXCEEDED)
+            throw;
+
+        throw Exception("Failed to read metadata file: " + metadata_file_path, ErrorCodes::UNKNOWN_FORMAT);
+    }
+}
+
+/// 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..ba6b7f952fc
--- /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 DiskObjectStorageMetadata 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 d5cc6b0a7ce..79a7978c53e 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -1,54 +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)
 {
@@ -112,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() != '/')
@@ -151,93 +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,
-            "-" + getFQDNOrHostName());
-
-        /// 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 e07307293fa..00000000000
--- a/src/Disks/S3/DiskS3.cpp
+++ /dev/null
@@ -1,1099 +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_,
-    String operation_log_suffix_)
-    : 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_)
-    , operation_log_suffix(operation_log_suffix_)
-{
-}
-
-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_log_suffix + "-" + 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::moveRecursiveOrRemove(const String & from_path, const String & to_path, bool send_metadata)
-{
-    if (exists(to_path))
-    {
-        if (send_metadata)
-        {
-            auto revision = ++revision_counter;
-            const ObjectMetadata object_metadata {
-                {"from_path", from_path},
-                {"to_path", to_path}
-            };
-            createFileOperationObject("rename", revision, object_metadata);
-        }
-        if (isDirectory(from_path))
-        {
-            for (auto it = iterateDirectory(from_path); it->isValid(); it->next())
-                moveRecursiveOrRemove(it->path(), fs::path(to_path) / it->name(), false);
-        }
-        else
-        {
-            removeFile(from_path);
-            LOG_WARNING(log, "Collision in S3 operation log: rename from '{}' to '{}', file removed", from_path, to_path);
-        }
-    }
-    else
-    {
-        moveFile(from_path, to_path, send_metadata);
-    }
-}
-
-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))
-                {
-                    moveRecursiveOrRemove(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 suffix;
-    String operation;
-
-    re2::RE2::FullMatch(key, key_regexp, &revision_str, &suffix, &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);
-}
-
-void DiskS3::syncRevision(UInt64 revision)
-{
-    UInt64 local_revision = revision_counter.load();
-    while ((revision > local_revision) && revision_counter.compare_exchange_weak(local_revision, revision));
-}
-
-UInt64 DiskS3::getRevision() const
-{
-    return revision_counter.load();
-}
-
-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 917836e5935..00000000000
--- a/src/Disks/S3/DiskS3.h
+++ /dev/null
@@ -1,199 +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_,
-        String operation_log_suffix_);
-
-    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;
-
-    void syncRevision(UInt64 revision) override;
-    UInt64 getRevision() const 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);
-
-    /// 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);
-
-    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}(-{hostname})-{operation}
-    const re2::RE2 key_regexp {".*/r(\\d+)(-[\\w\\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;
-
-    String operation_log_suffix;
-};
-
-}
-
-#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..f5513e8ec99 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -492,10 +492,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 +584,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/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/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/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/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/arrayDistance.cpp b/src/Functions/array/arrayDistance.cpp
index 7c1cddf4435..3f7900b6c62 100644
--- a/src/Functions/array/arrayDistance.cpp
+++ b/src/Functions/array/arrayDistance.cpp
@@ -7,21 +7,25 @@
 #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
     {
@@ -29,13 +33,13 @@ struct L1Distance
     };
 
     template <typename ResultType>
-    static void accumulate(State<ResultType> & state, ResultType x, ResultType y)
+    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,6 +49,8 @@ struct L2Distance
 {
     static inline String name = "L2";
 
+    struct ConstParams {};
+
     template <typename FloatType>
     struct State
     {
@@ -52,22 +58,53 @@ struct L2Distance
     };
 
     template <typename ResultType>
-    static void accumulate(State<ResultType> & state, ResultType x, ResultType y)
+    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
     {
@@ -75,21 +112,24 @@ struct LinfDistance
     };
 
     template <typename ResultType>
-    static void accumulate(State<ResultType> & state, ResultType x, ResultType y)
+    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
     {
@@ -99,7 +139,7 @@ struct CosineDistance
     };
 
     template <typename ResultType>
-    static void accumulate(State<ResultType> & state, ResultType x, ResultType y)
+    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());
         }
@@ -221,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)
@@ -237,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();
@@ -273,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();
 
@@ -284,9 +327,9 @@ private:
             typename Kernel::template State<Float64> state;
             for (; prev < off; ++prev)
             {
-                Kernel::template accumulate<Float64>(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;
@@ -294,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();
@@ -322,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();
 
@@ -333,19 +378,59 @@ private:
             typename Kernel::template State<Float64> state;
             for (size_t i = 0; prev < off; ++i, ++prev)
             {
-                Kernel::template accumulate<Float64>(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 {}; }
 };
 
+
+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
+{
+    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 b3b5aff7063..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";
 
+    struct ConstParams {};
+
     template <typename ResultType>
-    inline static ResultType accumulate(ResultType result, ResultType value)
+    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";
 
+    struct ConstParams {};
+
     template <typename ResultType>
-    inline static ResultType accumulate(ResultType result, ResultType value)
+    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";
 
+    struct ConstParams {};
+
     template <typename ResultType>
-    inline static ResultType accumulate(ResultType result, ResultType value)
+    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:
@@ -111,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,7 +151,7 @@ public:
         switch (result_type->getTypeId())
         {
             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 {}", result_type->getName());
@@ -148,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)
@@ -170,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();
@@ -178,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)
@@ -185,18 +213,59 @@ private:
             Float64 result = 0;
             for (; prev < off; ++prev)
             {
-                result = Kernel::template accumulate<Float64>(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 {}; }
 };
 
+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
+{
+    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/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/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/vectorFunctions.cpp b/src/Functions/vectorFunctions.cpp
index 2c29db81dd6..411b30040cc 100644
--- a/src/Functions/vectorFunctions.cpp
+++ b/src/Functions/vectorFunctions.cpp
@@ -810,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);
@@ -1109,10 +1111,12 @@ private:
 
 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_);
 
@@ -1132,6 +1136,14 @@ struct L2NormTraits
     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";
@@ -1156,6 +1168,14 @@ struct L2DistanceTraits
     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";
@@ -1174,10 +1194,12 @@ struct CosineDistanceTraits
 
 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>;
 
@@ -1200,7 +1222,7 @@ void registerVectorFunctions(FunctionFactory & factory)
     factory.registerFunction<TupleOrArrayFunctionL1Norm>();
     factory.registerFunction<TupleOrArrayFunctionL2Norm>();
     factory.registerFunction<TupleOrArrayFunctionLinfNorm>();
-    factory.registerFunction<FunctionLpNorm>();
+    factory.registerFunction<TupleOrArrayFunctionLpNorm>();
 
     factory.registerAlias("normL1", TupleOrArrayFunctionL1Norm::name, FunctionFactory::CaseInsensitive);
     factory.registerAlias("normL2", TupleOrArrayFunctionL2Norm::name, FunctionFactory::CaseInsensitive);
@@ -1210,7 +1232,7 @@ void registerVectorFunctions(FunctionFactory & factory)
     factory.registerFunction<TupleOrArrayFunctionL1Distance>();
     factory.registerFunction<TupleOrArrayFunctionL2Distance>();
     factory.registerFunction<TupleOrArrayFunctionLinfDistance>();
-    factory.registerFunction<FunctionLpDistance>();
+    factory.registerFunction<TupleOrArrayFunctionLpDistance>();
 
     factory.registerAlias("distanceL1", FunctionL1Distance::name, FunctionFactory::CaseInsensitive);
     factory.registerAlias("distanceL2", FunctionL2Distance::name, FunctionFactory::CaseInsensitive);
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/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 3454a940865..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
     {
@@ -250,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.
                 {
@@ -258,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));
 
@@ -285,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..99d2217cba3 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,52 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         return;
     }
 
+    if (node.name == "grouping")
+    {
+        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 182fb9fcd6c..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 (...)
         {
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 8e41887ca44..c5ca5748066 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -651,7 +651,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..971fe753978 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;
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index d143295181e..b26989179c2 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);
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 8b5c6ff2923..c4b7fa135da 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -791,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);
 }
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/TransactionLog.cpp b/src/Interpreters/TransactionLog.cpp
index c5aaaa8eab3..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())
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/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/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/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/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/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 620466b8035..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>
@@ -470,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);
@@ -520,7 +518,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     if (!disk)
         disk = reservation->getDisk();
 
-    UInt64 revision = parse<UInt64>(in.getResponseCookie("disk_revision", "0"));
+    UInt64 revision = parse<UInt64>(in->getResponseCookie("disk_revision", "0"));
     if (revision)
         disk->syncRevision(revision);
 
@@ -529,13 +527,13 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
     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)
@@ -549,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)
         {
@@ -557,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);
@@ -570,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/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index be1c9ffd370..7726a752cbe 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
@@ -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);
         }
@@ -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 c2c23793580..f596828ed05 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -535,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/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/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/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 0e0767e5cb4..1d4b22d4a59 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -7758,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 460d0268b3d..393ea0e24ff 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -86,8 +86,17 @@ class StorageS3Source::DisclosedGlobIterator::Impl : WithContext
 {
 
 public:
-    Impl(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_)
+    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);
@@ -230,7 +239,11 @@ private:
 };
 
 StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
-    Aws::S3::S3Client & client_, const S3::URI & globbed_uri_, ASTPtr query, const Block & virtual_header, ContextPtr context)
+    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))
 {
 }
@@ -379,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_,
@@ -516,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;
@@ -667,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;
@@ -728,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;
 
@@ -1010,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;
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index cec20120dd3..b246de18bfb 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -36,7 +36,12 @@ public:
     {
     public:
         DisclosedGlobIterator(
-            Aws::S3::S3Client & client_, const S3::URI & globbed_uri_, ASTPtr query, const Block & virtual_header, ContextPtr context);
+            const Aws::S3::S3Client & client_,
+            const S3::URI & globbed_uri_,
+            ASTPtr query,
+            const Block & virtual_header,
+            ContextPtr context);
+
         String next();
 
     private:
@@ -85,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_,
@@ -107,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;
 
@@ -194,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;
     };
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/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/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/report.py b/tests/ci/report.py
index c79a5406998..c8bd32bf642 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; }}
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/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/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/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/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/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/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/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_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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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_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/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/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/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/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/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/02282_array_distance.reference b/tests/queries/0_stateless/02282_array_distance.reference
index b7db2dceee8..ebce2788fe9 100644
--- a/tests/queries/0_stateless/02282_array_distance.reference
+++ b/tests/queries/0_stateless/02282_array_distance.reference
@@ -1,5 +1,6 @@
 6
 3.7416573867739413
+3.2071843327373397
 3
 0.00258509695694209
 \N
@@ -11,6 +12,9 @@ nan
 7.0710678118654755
 9.16515138991168
 12.12435565298214
+5.917593844525055
+8.308858759453505
+9.932246380845738
 2
 5
 4
diff --git a/tests/queries/0_stateless/02282_array_distance.sql b/tests/queries/0_stateless/02282_array_distance.sql
index 246b16daf65..75e4b0d653e 100644
--- a/tests/queries/0_stateless/02282_array_distance.sql
+++ b/tests/queries/0_stateless/02282_array_distance.sql
@@ -1,5 +1,6 @@
 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]);
 
@@ -26,6 +27,7 @@ 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 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;
@@ -42,6 +44,10 @@ SELECT v1.id, v2.id, L2Distance(v1.v, v2.v) as dist FROM vec1 v1, vec2d v2;
 
 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 68dbce0b436..ebaadee321f 100644
--- a/tests/queries/0_stateless/02283_array_norm.reference
+++ b/tests/queries/0_stateless/02283_array_norm.reference
@@ -1,27 +1,28 @@
 6
 7.0710678118654755
+10.882246697870885
 2
-10803059573	4234902446.7343364	2096941042
-1	5
-2	2
-3	5.196152422706632
-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.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
 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 8408eea3f8b..6938618d633 100644
--- a/tests/queries/0_stateless/02283_array_norm.sql
+++ b/tests/queries/0_stateless/02283_array_norm.sql
@@ -1,5 +1,6 @@
 SELECT L1Norm([1, 2, 3]);
 SELECT L2Norm([3., 4., 5.]);
+SELECT LpNorm([3., 4., 5.], 1.1);
 SELECT LinfNorm([0, 0, 2]);
 
 -- Overflows
@@ -7,6 +8,9 @@ WITH CAST([-547274980, 1790553898, 1981517754, 1908431500, 1352428565, -57341255
 SELECT
     L1Norm(a),
     L2Norm(a),
+    LpNorm(a,1),
+    LpNorm(a,2),
+    LpNorm(a,3.14),
     LinfNorm(a);
 
 DROP TABLE IF EXISTS vec1;
@@ -19,17 +23,23 @@ 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, L2Norm(v) 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, L2Norm(v) 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, L2Norm(v) 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 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;
 DROP TABLE vec1d;
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_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/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/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/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.+' || :